aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2008-03-26 20:26:50 +0000
committerJay Belanger2008-03-26 20:26:50 +0000
commit6a1414ce27766c76f6a1cc37fefd4817c0f23eff (patch)
treecae530dc1bf69ba599cf25d2803d375dd78a5a8e
parent2c81b4685d2cbf1b6aa8500e3bc68887df0db787 (diff)
downloademacs-6a1414ce27766c76f6a1cc37fefd4817c0f23eff.tar.gz
emacs-6a1414ce27766c76f6a1cc37fefd4817c0f23eff.zip
(calc-read-var-name-history): New variable.
(calc-read-var-name): Use `calc-read-var-name-history'.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/calc/calc-store.el7
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aad89568b06..63f7a6a3837 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-03-26 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc/calc-store.el (calc-read-var-name-history):
4 New variable.
5 (calc-read-var-name): Use `calc-read-var-name-history'.
6
12008-03-26 Stefan Monnier <monnier@iro.umontreal.ca> 72008-03-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * image-mode.el (image-mode-reapply-winprops): Simplify now that 9 * image-mode.el (image-mode-reapply-winprops): Simplify now that
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 5ffabe4adba..da0c1665b4d 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -185,6 +185,9 @@
185 185
186(defvar calc-store-opers) 186(defvar calc-store-opers)
187 187
188(defvar calc-read-var-name-history nil
189 "History for reading variable names.")
190
188(defun calc-read-var-name (prompt &optional calc-store-opers) 191(defun calc-read-var-name (prompt &optional calc-store-opers)
189 (setq calc-given-value nil 192 (setq calc-given-value nil
190 calc-aborted-prefix nil) 193 calc-aborted-prefix nil)
@@ -196,7 +199,9 @@
196 (minibuffer-completion-predicate 199 (minibuffer-completion-predicate
197 (lambda (x) (boundp (intern (concat "var-" x))))) 200 (lambda (x) (boundp (intern (concat "var-" x)))))
198 (minibuffer-completion-confirm t)) 201 (minibuffer-completion-confirm t))
199 (read-from-minibuffer prompt nil calc-var-name-map nil))))) 202 (read-from-minibuffer
203 prompt nil calc-var-name-map nil
204 'calc-read-var-name-history)))))
200 (setq calc-aborted-prefix "") 205 (setq calc-aborted-prefix "")
201 (and (not (equal var "var-")) 206 (and (not (equal var "var-"))
202 (if (string-match "\\`\\([-a-zA-Z0-9]+\\) *:?=" var) 207 (if (string-match "\\`\\([-a-zA-Z0-9]+\\) *:?=" var)