[Emacs-diffs] Changes to emacs/lisp/calc/calc-yank.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-yank.el
diff -c emacs/lisp/calc/calc-yank.el:1.12 emacs/lisp/calc/calc-yank.el:1.13
*** emacs/lisp/calc/calc-yank.el:1.12   Sun Jan  2 06:49:36 2005
--- emacs/lisp/calc/calc-yank.el        Sun Jan  2 07:22:44 2005
***************
*** 467,473 ****
      (insert (or title title "Calc Edit Mode. ")
            "Press `C-c C-c'"
              (if allow-ret "" " or RET")
!           " to finish, `C-x k RET' to cancel.\n")))
  (put 'calc-edit-mode 'mode-class 'special)
  
  (defun calc-show-edit-buffer ()
--- 467,473 ----
      (insert (or title title "Calc Edit Mode. ")
            "Press `C-c C-c'"
              (if allow-ret "" " or RET")
!           " to finish, `C-x k RET' to cancel.\n\n")))
  (put 'calc-edit-mode 'mode-class 'special)
  
  (defun calc-show-edit-buffer ()
***************
*** 485,491 ****
              (delete-window win))))
      (set-buffer-modified-p nil)
      (goto-char (point-min))
!     (forward-line 1)))
  
  (defun calc-edit-return ()
    (interactive)
--- 485,491 ----
              (delete-window win))))
      (set-buffer-modified-p nil)
      (goto-char (point-min))
!     (forward-line 2)))
  
  (defun calc-edit-return ()
    (interactive)
***************
*** 522,527 ****
--- 522,529 ----
      (goto-char (point-min))
      (when (looking-at "Calc Edit\\|Editing ")
        (forward-line 1))
+     (if (looking-at "^ *$")
+         (forward-line 1))
      (if (buffer-modified-p)
        (eval calc-edit-handler))
      (if one-window