(calc-match): Use an extra argument instead of `interactive-p'.

This commit is contained in:
Jay Belanger 2004-10-26 19:09:40 +00:00
parent 1f5a0f5d5d
commit 8cb77f98f0
2 changed files with 15 additions and 3 deletions

View file

@ -1,3 +1,15 @@
2004-10-26 Jay Belanger <belanger@truman.edu>
* 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 <storm@cua.dk>
* help.el (describe-key): Describe both down-event and up-event

View file

@ -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)))