diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2015-10-08 08:32:00 -0500 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2015-10-08 08:32:00 -0500 |
| commit | 2124b332a21c0baf918731aa23f44cd62177d073 (patch) | |
| tree | 3a2b54d4e6d0131ffbf795e0c60d9ea41038c9ec /lisp/calc/calc-aent.el | |
| parent | 1f37714a11ec91c6aa68a73c7ff6714b24ddadfa (diff) | |
| download | emacs-2124b332a21c0baf918731aa23f44cd62177d073.tar.gz | |
Format initial input uniformly.
* lisp/calc/calc.el (calc-digit-start-entry): New function.
* lisp/calc/calc.el (calcDigit-start):
* lisp/calc/calc-aent.el (calc-alg-digit-entry):
Use `calc-digit-start-entry' to format input.
Diffstat (limited to 'lisp/calc/calc-aent.el')
| -rw-r--r-- | lisp/calc/calc-aent.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index 6336c3362fb..f4754c73e7e 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -30,6 +30,7 @@ (require 'calc-macs) ;; Declare functions which are defined elsewhere. +(declare-function calc-digit-start-entry "calc" ()) (declare-function calc-refresh-evaltos "calc-ext" (&optional which-var)) (declare-function calc-execute-kbd-macro "calc-prog" (mac arg &rest prefix)) (declare-function math-is-true "calc-ext" (expr)) @@ -450,12 +451,7 @@ The value t means abort and give an error message.") ;;;###autoload (defun calc-alg-digit-entry () (calc-alg-entry - (cond ((eq last-command-event ?e) - (if (> calc-number-radix 14) (format "%d.^" calc-number-radix) "1e")) - ((eq last-command-event ?#) (format "%d#" calc-number-radix)) - ((eq last-command-event ?_) "-") - ((eq last-command-event ?@) "0@ ") - (t (char-to-string last-command-event))))) + (calc-digit-start-entry))) ;; The variable calc-digit-value is initially declared in calc.el, ;; but can be set by calcDigit-algebraic and calcDigit-edit. |