[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 9d0b103: Minor fixes in calculator.el
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 9d0b103: Minor fixes in calculator.el |
Date: |
Wed, 24 Feb 2016 20:36:27 +0000 |
branch: emacs-25
commit 9d0b103a45dc3e855bae8cb727797279021131fd
Author: Chris Zheng <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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
---
lisp/calculator.el | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 9c94023..bba52e2 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 9d0b103: Minor fixes in calculator.el,
Eli Zaretskii <=