summaryrefslogtreecommitdiff
path: root/lisp/calculator.el
diff options
context:
space:
mode:
authorChris Zheng <chriszheng99@gmail.com>2016-02-24 22:35:18 +0200
committerEli Zaretskii <eliz@gnu.org>2016-02-24 22:35:18 +0200
commit9d0b103a45dc3e855bae8cb727797279021131fd (patch)
treec3c3c72823c31c061c073e1977d04b207e9a3335 /lisp/calculator.el
parente6a381956048113f00ef08340e6f31df93ee0158 (diff)
downloademacs-9d0b103a45dc3e855bae8cb727797279021131fd.tar.gz
Minor fixes in calculator.el
* lisp/calculator.el (calculator-mode-map): Bind `E' for `calculator-exp'. (calculator-last-input): Fix a bug with pressing F1. (Bug#20764) Copyright-paperwork-exempt: yes
Diffstat (limited to 'lisp/calculator.el')
-rw-r--r--lisp/calculator.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 9c94023a2a2..bba52e22544 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -394,7 +394,7 @@ Used for repeating operations in calculator-repR/L.")
[kp-5] [kp-6] [kp-7] [kp-8] [kp-9])
(calculator-op [kp-divide] [kp-multiply])
(calculator-decimal "." [kp-decimal])
- (calculator-exp "e")
+ (calculator-exp "e" "E")
(calculator-dec/deg-mode "D")
(calculator-set-register "s")
(calculator-get-register "g")
@@ -1219,7 +1219,7 @@ arguments."
"Last char (or event or event sequence) that was read.
Use KEYS if given, otherwise use `this-command-keys'."
(let ((inp (or keys (this-command-keys))))
- (if (or (stringp inp) (not (arrayp inp)))
+ (if (or (stringp inp) (not (arrayp inp)) (member inp '([f1] [help])))
inp
;; Translates kp-x to x and [tries to] create a string to lookup
;; operators; assume all symbols are translatable via