From 17c90a9e65944b394a619f57dce33c5e8c04f549 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Wed, 19 Jan 2005 17:21:44 +0000 Subject: [PATCH] (calc-user-define-edit): Put original formula in formula editing buffer. --- lisp/ChangeLog | 3 +++ lisp/calc/calc-prog.el | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0a801ad992f..cf269a770e9 100644 --- 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 * 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 33d183b5c8c..a37f3c5cedd 100644 --- 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"))))))) -- 2.39.2