diff options
| author | Jay Belanger | 2004-10-26 19:09:40 +0000 |
|---|---|---|
| committer | Jay Belanger | 2004-10-26 19:09:40 +0000 |
| commit | 8cb77f98f0cfb2bb459ead5006a03d83d3eb5ead (patch) | |
| tree | bf5a3b6e9386ec519d64bccdc0446146d456a06e /lisp/calc | |
| parent | 1f5a0f5d5d3e2513ece677c07257dc24d6c54bb1 (diff) | |
| download | emacs-8cb77f98f0cfb2bb459ead5006a03d83d3eb5ead.tar.gz emacs-8cb77f98f0cfb2bb459ead5006a03d83d3eb5ead.zip | |
(calc-match): Use an extra argument instead of `interactive-p'.
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-rewr.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el index 51cffb753fc..47b48bd88d8 100644 --- a/lisp/calc/calc-rewr.el +++ b/lisp/calc/calc-rewr.el | |||
| @@ -143,15 +143,15 @@ | |||
| 143 | (calc-pop-push-record-list n "rwrt" (list expr))) | 143 | (calc-pop-push-record-list n "rwrt" (list expr))) |
| 144 | (calc-handle-whys))) | 144 | (calc-handle-whys))) |
| 145 | 145 | ||
| 146 | (defun calc-match (pat) | 146 | (defun calc-match (pat &optional interactive) |
| 147 | (interactive "sPattern: \n") | 147 | (interactive "sPattern: \np") |
| 148 | (calc-slow-wrapper | 148 | (calc-slow-wrapper |
| 149 | (let (n expr) | 149 | (let (n expr) |
| 150 | (if (or (null pat) (equal pat "") (equal pat "$")) | 150 | (if (or (null pat) (equal pat "") (equal pat "$")) |
| 151 | (setq expr (calc-top-n 2) | 151 | (setq expr (calc-top-n 2) |
| 152 | pat (calc-top-n 1) | 152 | pat (calc-top-n 1) |
| 153 | n 2) | 153 | n 2) |
| 154 | (if (interactive-p) (setq calc-previous-alg-entry pat)) | 154 | (if interactive (setq calc-previous-alg-entry pat)) |
| 155 | (setq pat (if (stringp pat) (math-read-expr pat) pat)) | 155 | (setq pat (if (stringp pat) (math-read-expr pat) pat)) |
| 156 | (if (eq (car-safe pat) 'error) | 156 | (if (eq (car-safe pat) 'error) |
| 157 | (error "Bad format in expression: %s" (nth 1 pat))) | 157 | (error "Bad format in expression: %s" (nth 1 pat))) |