(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)

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

diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 9323952180144a49596f16a359948f12079e9c6d..52f0cc0272d6600dd9345a17a64ee0303ec5c186 100644 (file)
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -200,7 +200,7 @@
 
 (defun calcVar-digit ()
   (interactive)
-  (if (calc-minibuffer-contains "var-\\'")
+  (if (calc-minibuffer-contains "\\'")
       (if (eq calc-store-opers 0)
          (beep)
        (insert "q")
@@ -210,7 +210,7 @@
 (defun calcVar-oper ()
   (interactive)
   (if (and (eq calc-store-opers t)
-          (calc-minibuffer-contains "var-\\'"))
+          (calc-minibuffer-contains "\\'"))
       (progn
        (erase-buffer)
        (self-insert-and-exit))
@@ -397,7 +397,7 @@
         (setq calc-last-edited-variable var)
         (calc-edit-mode (list 'calc-finish-stack-edit (list 'quote var))
                         t
-                        (concat "Editing " (calc-var-name var)))
+                        (concat "Editing variable `" (calc-var-name var) "'. "))
         (and value
              (insert (math-format-nice-expr value (frame-width)) "\n")))))
   (calc-show-edit-buffer))
@@ -482,7 +482,7 @@
                             (setq rp nil)))
                       (not rp)))))
      (calc-unread-command ?\C-a)
-     (setq decl (read-string (format "Declare: %s  to be: " var)
+     (setq decl (read-string (format "Declare: %s  to be: " (calc-var-name var))
                             (and rp
                                  (math-format-flat-expr (nth 2 (car dp)) 0))))
      (setq decl (and (string-match "[^ \t]" decl)