summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/calc/calc-prog.el10
2 files changed, 10 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a58b20c9343..62cf2518772 100644
--- 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 b171010e220..1ee3173848a 100644
--- 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))