diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/calc/calc-rewr.el | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c63e8a1491..5fae5de22d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2004-10-26 Jay Belanger <[email protected]> + + * calc/calc.el (calc,full-calc, calc-quit, calc-keypad) + (full-calc-keypad, calc-trail-display): Use an extra argument + instead of `interactive-p'. + + * calc/calc-misc.el (calc-other-window): Use an extra argument + instead of `interactive-p'. + + * calc/calc-rewr.el (calc-match): Use an extra argument instead of + `interactive-p'. + 2004-10-26 Kim F. Storm <[email protected]> * help.el (describe-key): Describe both down-event and up-event diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el index 51cffb753f..47b48bd88d 100644 --- a/lisp/calc/calc-rewr.el +++ b/lisp/calc/calc-rewr.el @@ -143,15 +143,15 @@ (calc-pop-push-record-list n "rwrt" (list expr))) (calc-handle-whys))) -(defun calc-match (pat) - (interactive "sPattern: \n") +(defun calc-match (pat &optional interactive) + (interactive "sPattern: \np") (calc-slow-wrapper (let (n expr) (if (or (null pat) (equal pat "") (equal pat "$")) (setq expr (calc-top-n 2) pat (calc-top-n 1) n 2) - (if (interactive-p) (setq calc-previous-alg-entry pat)) + (if interactive (setq calc-previous-alg-entry pat)) (setq pat (if (stringp pat) (math-read-expr pat) pat)) (if (eq (car-safe pat) 'error) (error "Bad format in expression: %s" (nth 1 pat))) |