(calc-user-define-edit): Put original formula in formula editing buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a801ad992f7d78be0d9b4fabf249938780fec70..cf269a770e9d9fae49dc8f57676e7335a009cd82 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,9 @@
        * calc/calc-ext.el (calc-fancy-prefix-other-key): Don't clear
        flags if the last command was a tab or M-tab.
 
+       * calc/calc-prog.el (calc-user-define-edit): Put original formula
+       in formula editing buffer.
+
 2005-01-19  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gdb-ui.el (gdb-put-breakpoint-icon): Add help-echo for

diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 33d183b5c8c58b9e43915c755ad2f77eeec58252..a37f3c5ceddf7fe48a43415cdec73d733c37d662 100644 (file)
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -702,15 +702,17 @@
                     (intcmd (symbol-name (cdr def)))
                     (algcmd (substring (symbol-name func) 9)))
               (if (and defn (calc-valid-formula-func func))
-                  (progn
+                  (let ((niceexpr (math-format-nice-expr defn (frame-width))))
                     (calc-wrapper
                      (calc-edit-mode 
                        (list 'calc-finish-formula-edit (list 'quote func))
                        nil
-                       (format "Editing formula (%s, %s, bound to %s).\n"
-                               intcmd algcmd kys))
+                       (format (concat
+                                "Editing formula (%s, %s, bound to %s).\n"
+                                "Original formula: %s\n")
+                               intcmd algcmd kys niceexpr))
                      (insert  (math-showing-full-precision
-                                (math-format-nice-expr defn (frame-width)))
+                                niceexpr)
                                "\n"))
                     (calc-show-edit-buffer))
                 (error "That command's definition cannot be edited")))))))