Mercurial > emacs

comparison lisp/calc/calc-store.el @ 84889:fa8470bb9f1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(calc-var-name-map): Use `mapc' rather than `mapcar'.
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 26 Sep 2007 00:07:05 +0000
parents 095d08e7d6bb
children 107ccd98fa12 bdb3fe0ba9fa
comparison
equal deleted inserted replaced
84888:23f1c8af4174 84889:fa8470bb9f1a
125 (let ((calc-full-trail-vectors nil)) 125 (let ((calc-full-trail-vectors nil))
126 (calc-record value (format ">%s%s" tag (calc-var-name var))))) 126 (calc-record value (format ">%s%s" tag (calc-var-name var)))))
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))
134 (setq msg (format " (Note: %s has built-in meanings which may interfere)" 134 (setq msg (format " (Note: %s has built-in meanings which may interfere)"
135 (calc-var-name var))))) 135 (calc-var-name var)))))
170 (defvar calc-var-name-map nil "Keymap for reading Calc variable names.") 170 (defvar calc-var-name-map nil "Keymap for reading Calc variable names.")
171 (if calc-var-name-map 171 (if calc-var-name-map
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)))))
200 (setq calc-aborted-prefix "") 200 (setq calc-aborted-prefix "")
201 (and (not (equal var "var-")) 201 (and (not (equal var "var-"))
399 (calc-wrapper 399 (calc-wrapper
400 (or sconst (setq sconst (completing-read "Special constant: " sc nil t))) 400 (or sconst (setq sconst (completing-read "Special constant: " sc nil t)))
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 "")))
408 (message (concat "Special constant \"%s\" copied to \"%s\"" msg) 408 (message (concat "Special constant \"%s\" copied to \"%s\"" msg)
409 sconst (calc-var-name var))))))))) 409 sconst (calc-var-name var)))))))))
415 (if var1 415 (if var1
416 (let ((value (calc-var-value var1))) 416 (let ((value (calc-var-value var1)))
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 "")))
424 (message (concat "Variable \"%s\" copied to \"%s\"" msg) 424 (message (concat "Variable \"%s\" copied to \"%s\"" msg)
425 (calc-var-name var1) (calc-var-name var2)))))))) 425 (calc-var-name var1) (calc-var-name var2))))))))