emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/calc/calc-store.el


From: Jay Belanger
Subject: [Emacs-diffs] Changes to emacs/lisp/calc/calc-store.el
Date: Mon, 27 Dec 2004 00:15:13 -0500

Index: emacs/lisp/calc/calc-store.el
diff -c emacs/lisp/calc/calc-store.el:1.8 emacs/lisp/calc/calc-store.el:1.9
*** emacs/lisp/calc/calc-store.el:1.8   Tue Nov 30 17:25:00 2004
--- emacs/lisp/calc/calc-store.el       Mon Dec 27 05:02:08 2004
***************
*** 174,186 ****
  (defun calc-read-var-name (prompt &optional calc-store-opers)
    (setq calc-given-value nil
        calc-aborted-prefix nil)
!   (let ((var (let ((minibuffer-completion-table obarray)
!                  (minibuffer-completion-predicate 'boundp)
!                  (minibuffer-completion-confirm t))
!              (read-from-minibuffer prompt "var-" calc-var-name-map nil))))
      (setq calc-aborted-prefix "")
!     (and (not (equal var ""))
!        (not (equal var "var-"))
         (if (string-match "\\`\\([-a-zA-Z0-9]+\\) *:?=" var)
             (if (null calc-given-value-flag)
                 (error "Assignment is not allowed in this command")
--- 174,190 ----
  (defun calc-read-var-name (prompt &optional calc-store-opers)
    (setq calc-given-value nil
        calc-aborted-prefix nil)
!   (let ((var (concat 
!               "var-"
!               (let ((minibuffer-completion-table
!                      (mapcar (lambda (x) (substring x 4)) 
!                              (all-completions "var-" obarray)))
!                     (minibuffer-completion-predicate 
!                      (lambda (x) (boundp (intern (concat "var-" x)))))
!                     (minibuffer-completion-confirm t))
!                 (read-from-minibuffer prompt nil calc-var-name-map nil)))))
      (setq calc-aborted-prefix "")
!     (and (not (equal var "var-"))
         (if (string-match "\\`\\([-a-zA-Z0-9]+\\) *:?=" var)
             (if (null calc-given-value-flag)
                 (error "Assignment is not allowed in this command")




reply via email to

[Prev in Thread] Current Thread [Next in Thread]