Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / lisp / calc / calc-store.el

diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index e439150..80d355e 100644 (file)
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -1,17 +1,16 @@
 ;;; calc-store.el --- value storage functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -185,6 +182,9 @@
 
 (defvar calc-store-opers)
 
+(defvar calc-read-var-name-history nil
+  "History for reading variable names.")
+
 (defun calc-read-var-name (prompt &optional calc-store-opers)
   (setq calc-given-value nil
        calc-aborted-prefix nil)
@@ -196,10 +196,12 @@
                     (minibuffer-completion-predicate
                      (lambda (x) (boundp (intern (concat "var-" x)))))
                     (minibuffer-completion-confirm t))
-                (read-from-minibuffer prompt nil calc-var-name-map nil)))))
+                (read-from-minibuffer
+                 prompt nil calc-var-name-map nil
+                 'calc-read-var-name-history)))))
     (setq calc-aborted-prefix "")
     (and (not (equal var "var-"))
-        (if (string-match "\\`\\([-a-zA-Z0-9]+\\) *:?=" var)
+        (if (string-match "\\`\\([-a-zA-Zα-ωΑ-Ω0-9]+\\) *:?=" var)
             (if (null calc-given-value-flag)
                 (error "Assignment is not allowed in this command")
               (let ((svar (intern (substring var 0 (match-end 1)))))
@@ -378,15 +380,15 @@
 
 (defun calc-store-quick ()
   (interactive)
-  (calc-store (intern (format "var-q%c" last-command-char))))
+  (calc-store (intern (format "var-q%c" last-command-event))))
 
 (defun calc-store-into-quick ()
   (interactive)
-  (calc-store-into (intern (format "var-q%c" last-command-char))))
+  (calc-store-into (intern (format "var-q%c" last-command-event))))
 
 (defun calc-recall-quick ()
   (interactive)
-  (calc-recall (intern (format "var-q%c" last-command-char))))
+  (calc-recall (intern (format "var-q%c" last-command-event))))
 
 (defun calc-copy-special-constant (&optional sconst var)
   (interactive)
@@ -634,8 +636,7 @@
 
 (defun calc-insert-variables (buf)
   (interactive "bBuffer in which to save variable values: ")
-  (save-excursion
-    (set-buffer buf)
+  (with-current-buffer buf
     (mapatoms (function
               (lambda (x)
                 (and (string-match "\\`var-" (symbol-name x))
@@ -675,5 +676,8 @@
 
 (provide 'calc-store)
 
-;;; arch-tag: 2fbfec82-a521-42ca-bcd8-4f254ae6313e
+;; Local variables:
+;; coding: utf-8
+;; End:
+
 ;;; calc-store.el ends here