Merge from origin/emacs-24

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

diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 890e624ecb45c047c3d2a9dfeb26849c1ee7db1c..9c5d7184149e45a215cb77a1bd21c48f4fe3cf28 100644 (file)
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -1,7 +1,6 @@
 ;;; calc-misc.el --- miscellaneous functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -220,10 +219,10 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
   (let ((msgs
         '("Press `h' for complete help; press `?' repeatedly for a summary"
           "Letter keys: Negate; Precision; Yank; Why; Xtended cmd; Quit"
-          "Letter keys: SHIFT + Undo, reDo; Keep-args; Inverse, Hyperbolic, Option"
+          "Letter keys: SHIFT + Undo, reDo; Inverse, Hyperbolic, Option"
           "Letter keys: SHIFT + sQrt; Sin, Cos, Tan; Exp, Ln, logB"
           "Letter keys: SHIFT + Floor, Round; Abs, conJ, arG; Pi"
-          "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro"
+          "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro; Keep-args"
           "Other keys: +, -, *, /, ^, \\ (int div), : (frac div)"
           "Other keys: & (1/x), | (concat), % (modulo), ! (factorial)"
           "Other keys: ' (alg-entry), = (eval), ` (edit); M-RET (last-args)"
@@ -261,13 +260,13 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
                                                       (length msg)) 32)
                                       "  [?=MORE]")
                             ""))))))))
-  
+
 
 
 
 ;;;; Stack and buffer management.
 
-;; The variable calc-last-why-command is set in calc-do-handly-whys
+;; The variable calc-last-why-command is set in calc-do-handle-whys
 ;; and used in calc-why (in calc-stuff.el).
 (defvar calc-last-why-command)
 
@@ -306,7 +305,8 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
               (string-match "\\`\\*" (car stuff)))
          (setq stuff (cons '* (cons (substring (car stuff) 1)
                                     (cdr stuff)))))))
-  (setq calc-next-why (cons stuff calc-next-why))
+  (unless (member stuff calc-next-why)
+    (setq calc-next-why (cons stuff calc-next-why)))
   nil)
 
 ;; True if A is a constant or vector of constants.  [P x] [Public]
@@ -963,5 +963,4 @@ doing 'M-x toggle-debug-on-error', then reproducing the bug.
 ;; generated-autoload-file: "calc-loaddefs.el"
 ;; End:
 
-;; arch-tag: 7984d9d0-62e5-41dc-afb8-e904b975f250
 ;;; calc-misc.el ends here