X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7c420169baa7c50428589cca7f8eda71b462eb15..e82fd952f1548e3873ee78a748078ebc2eeb5119:/lisp/calc/calc-misc.el diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index 890e624ecb..9c5d718414 100644 --- 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 ;; Maintainer: Jay Belanger @@ -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