comparison lisp/calc/calc-prog.el @ 59641:292caf631179

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

59640:767c8c2a2d5c

			       (get func 'calc-user-defn)))
                    (kys (concat "z" (char-to-string (car def))))
                    (intcmd (symbol-name (cdr def)))
                    (algcmd (substring (symbol-name func) 9)))
	       (if (and defn (calc-valid-formula-func func))
		   (progn
		     (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))
		      (insert  (math-showing-full-precision
                                (math-format-nice-expr defn (frame-width)))
                               "\n"))
		     (calc-show-edit-buffer))
		 (error "That command's definition cannot be edited")))))))

;; Formatting the macro buffer

59641:292caf631179

			       (get func 'calc-user-defn)))
                    (kys (concat "z" (char-to-string (car def))))
                    (intcmd (symbol-name (cdr def)))
                    (algcmd (substring (symbol-name func) 9)))
	       (if (and defn (calc-valid-formula-func func))
		   (let ((niceexpr (math-format-nice-expr defn (frame-width))))
		     (calc-wrapper
		      (calc-edit-mode 
                       (list 'calc-finish-formula-edit (list 'quote func))
                       nil
                       (format (concat
                                "Editing formula (%s, %s, bound to %s).\n"
                                "Original formula: %s\n")
                               intcmd algcmd kys niceexpr))
		      (insert  (math-showing-full-precision
                                niceexpr)
                               "\n"))
		     (calc-show-edit-buffer))
		 (error "That command's definition cannot be edited")))))))

;; Formatting the macro buffer