aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-09-26 00:07:05 +0000
committerJuanma Barranquero2007-09-26 00:07:05 +0000
commit19449d1d81fbffc07321df1492b79e27b186ac8a (patch)
tree5b8878e1524c5f077ebd9538dd5b732267a178d8
parentab58914bb6b45edabc4bd1da9a01014ca49ea70a (diff)
downloademacs-19449d1d81fbffc07321df1492b79e27b186ac8a.tar.gz
emacs-19449d1d81fbffc07321df1492b79e27b186ac8a.zip
(calc-var-name-map): Use `mapc' rather than `mapcar'.
-rw-r--r--lisp/calc/calc-store.el32
1 files changed, 16 insertions, 16 deletions
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 75a17661746..e439150814a 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -127,7 +127,7 @@
127 (cond 127 (cond
128 ((and (memq var '(var-e var-i var-pi var-phi var-gamma)) 128 ((and (memq var '(var-e var-i var-pi var-phi var-gamma))
129 (eq (car-safe old) 'special-const)) 129 (eq (car-safe old) 'special-const))
130 (setq msg (format " (Note: Built-in definition of %s has been lost)" 130 (setq msg (format " (Note: Built-in definition of %s has been lost)"
131 (calc-var-name var)))) 131 (calc-var-name var))))
132 ((and (memq var '(var-inf var-uinf var-nan)) 132 ((and (memq var '(var-inf var-uinf var-nan))
133 (null old)) 133 (null old))
@@ -172,28 +172,28 @@
172 () 172 ()
173 (setq calc-var-name-map (copy-keymap minibuffer-local-completion-map)) 173 (setq calc-var-name-map (copy-keymap minibuffer-local-completion-map))
174 (define-key calc-var-name-map " " 'self-insert-command) 174 (define-key calc-var-name-map " " 'self-insert-command)
175 (mapcar (function 175 (mapc (function
176 (lambda (x) 176 (lambda (x)
177 (define-key calc-var-name-map (char-to-string x) 177 (define-key calc-var-name-map (char-to-string x)
178 'calcVar-digit))) 178 'calcVar-digit)))
179 "0123456789") 179 "0123456789")
180 (mapcar (function 180 (mapc (function
181 (lambda (x) 181 (lambda (x)
182 (define-key calc-var-name-map (char-to-string x) 182 (define-key calc-var-name-map (char-to-string x)
183 'calcVar-oper))) 183 'calcVar-oper)))
184 "+-*/^|")) 184 "+-*/^|"))
185 185
186(defvar calc-store-opers) 186(defvar calc-store-opers)
187 187
188(defun calc-read-var-name (prompt &optional calc-store-opers) 188(defun calc-read-var-name (prompt &optional calc-store-opers)
189 (setq calc-given-value nil 189 (setq calc-given-value nil
190 calc-aborted-prefix nil) 190 calc-aborted-prefix nil)
191 (let ((var (concat 191 (let ((var (concat
192 "var-" 192 "var-"
193 (let ((minibuffer-completion-table 193 (let ((minibuffer-completion-table
194 (mapcar (lambda (x) (substring x 4)) 194 (mapcar (lambda (x) (substring x 4))
195 (all-completions "var-" obarray))) 195 (all-completions "var-" obarray)))
196 (minibuffer-completion-predicate 196 (minibuffer-completion-predicate
197 (lambda (x) (boundp (intern (concat "var-" x))))) 197 (lambda (x) (boundp (intern (concat "var-" x)))))
198 (minibuffer-completion-confirm t)) 198 (minibuffer-completion-confirm t))
199 (read-from-minibuffer prompt nil calc-var-name-map nil))))) 199 (read-from-minibuffer prompt nil calc-var-name-map nil)))))
@@ -401,7 +401,7 @@
401 (unless (string= sconst "") 401 (unless (string= sconst "")
402 (let ((value (cdr (assoc sconst sc)))) 402 (let ((value (cdr (assoc sconst sc))))
403 (or var (setq var (calc-read-var-name 403 (or var (setq var (calc-read-var-name
404 (format "Copy special constant %s, to: " 404 (format "Copy special constant %s, to: "
405 sconst)))) 405 sconst))))
406 (if var 406 (if var
407 (let ((msg (calc-store-value var value ""))) 407 (let ((msg (calc-store-value var value "")))
@@ -417,7 +417,7 @@
417 (or value 417 (or value
418 (error "No such variable: \"%s\"" (calc-var-name var1))) 418 (error "No such variable: \"%s\"" (calc-var-name var1)))
419 (or var2 (setq var2 (calc-read-var-name 419 (or var2 (setq var2 (calc-read-var-name
420 (format "Copy variable: %s, to: " 420 (format "Copy variable: %s, to: "
421 (calc-var-name var1))))) 421 (calc-var-name var1)))))
422 (if var2 422 (if var2
423 (let ((msg (calc-store-value var2 value ""))) 423 (let ((msg (calc-store-value var2 value "")))