(calc-edit-user-formula, calc-finish-formula-edit): Handle extra line

in header.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a58b20c9343954c979568c0f01eecefffd1cb308..62cf25187727e21753991cd55d7a5829bf6e387a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,16 @@
 2005-01-01  Jay Belanger  <belanger@truman.edu>
 
        * calc-yank.el (calc-edit-mode): Change default header.
-
+       (calc-edit-finish, calc-show-edit-buffer): Adjust to handle new
+       header. 
+       
        * calc-store.el (calc-edit-variable): Change title to match new
        header.
 
-       * calc/calc-prog.el (calc-edit-user-syntax): Change title to edit
+       * calc/calc-prog.el (calc-edit-user-syntax): Change title in edit
        mode to match new header.
        (calc-user-define-edit): Change titles to include names of commands.
+       (calc-finish-formula-edit): Adjust to handle new header.
        (calc-finish-macro-edit): Remove.
        (calc-edit-macro-repeats, calc-edit-macro-adjust-buffer)
        (calc-edit-macro-command, calc-edit-macro-command-type)

diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index b171010e22081429e06a39d9bed40ed9f5f94764..1ee3173848a382d637c333db844d34b615486bd6 100644 (file)
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -714,12 +714,12 @@
                        nil
                        (format "Editing formula (%s, %s, bound to %s).\n"
                                intcmd algcmd kys))
-                     (insert (math-showing-full-precision
-                              (math-format-nice-expr defn (frame-width)))
-                             "\n"))
+                     (insert  (math-showing-full-precision
+                                (math-format-nice-expr defn (frame-width)))
+                               "\n"))
                     (calc-show-edit-buffer)
                      (goto-char (point-min))
-                     (forward-line 2))
+                     (forward-line 3))
                 (error "That command's definition cannot be edited")))))))
 
 ;; Formatting the macro buffer
@@ -947,7 +947,7 @@ Redefine the corresponding command."
 
 (defun calc-finish-formula-edit (func)
   (goto-char (point-min))
-  (forward-line 2)
+  (forward-line 3)
   (let ((buf (current-buffer))
        (str (buffer-substring (point) (point-max)))
        (start (point))