Merge from origin/emacs-25

[gnu-emacs] / lisp / calc / calc-store.el

diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 2da551ee215ae7f81d90ff6797a9dc280323095b..e8da2bc327a0a3d6d380d35c305036b97b6b6f7c 100644 (file)
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -1,9 +1,8 @@
 ;;; calc-store.el --- value storage functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 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.
 
@@ -58,8 +57,8 @@
              (let ((msg
                     (calc-store-value var (or calc-given-value (calc-top 1))
                                       "" calc-given-value-flag)))
-               (message (concat "Stored to variable \"%s\"" msg)
-                        (calc-var-name var)))))
+               (message "Stored to variable \"%s\"%s"
+                        (calc-var-name var) msg))))
        (setq var (calc-is-assignments (calc-top 1)))
        (if var
           (while var
@@ -67,8 +66,8 @@
                     (calc-store-value (car (car var)) (cdr (car var))
                                       (if (not (cdr var)) "")
                                       (if (not (cdr var)) 1))))
-               (message (concat "Stored to variable \"%s\"" msg)
-                        (calc-var-name (car (car var)))))
+               (message "Stored to variable \"%s\"%s"
+                        (calc-var-name (car (car var))) msg))
             (setq var (cdr var))))))))
 
 (defun calc-store-plus (&optional var)
@@ -235,8 +234,7 @@
 (defun calc-store-map (&optional oper var)
   (interactive)
   (calc-wrapper
-   (let* ((sel-mode nil)
-         (calc-dollar-values (mapcar 'calc-get-stack-element
+   (let* ((calc-dollar-values (mapcar #'calc-get-stack-element
                                      (nthcdr calc-stack-top calc-stack)))
          (calc-dollar-used 0)
          (oper (or oper (calc-get-operator "Store Mapping")))
@@ -423,8 +421,8 @@
                                       (calc-var-name var1)))))
         (if var2
             (let ((msg (calc-store-value var2 value "")))
-               (message (concat "Variable \"%s\" copied to \"%s\"" msg)
-                        (calc-var-name var1) (calc-var-name var2))))))))
+               (message "Variable \"%s\" copied to \"%s\"%s"
+                        (calc-var-name var1) (calc-var-name var2) msg)))))))
 
 (defvar calc-last-edited-variable nil)
 (defun calc-edit-variable (&optional var)
@@ -443,7 +441,8 @@
         (setq calc-last-edited-variable var)
         (calc-edit-mode (list 'calc-finish-stack-edit (list 'quote var))
                         t
-                        (concat "Editing variable `" (calc-var-name var) "'. "))
+                        (format-message
+                          "Editing variable `%s'" (calc-var-name var)))
         (and value
              (insert (math-format-nice-expr value (frame-width)) "\n")))))
   (calc-show-edit-buffer))
@@ -610,7 +609,8 @@
 
 (defun calc-insert-permanent-variable (var)
   (goto-char (point-min))
-  (if (search-forward (concat "(setq " (symbol-name var) " '") nil t)
+  (if (let (case-fold-search)
+        (search-forward (concat "(setq " (symbol-name var) " '") nil t))
       (progn
        (setq calc-pv-pos (point-marker))
        (forward-line -1)
@@ -676,8 +676,4 @@
 
 (provide 'calc-store)
 
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; calc-store.el ends here