[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2124b33: Format initial input uniformly.
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] master 2124b33: Format initial input uniformly. |
Date: |
Thu, 08 Oct 2015 13:33:24 +0000 |
branch: master
commit 2124b332a21c0baf918731aa23f44cd62177d073
Author: Jay Belanger <address@hidden>
Commit: Jay Belanger <address@hidden>
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.
---
lisp/calc/calc-aent.el | 8 ++------
lisp/calc/calc.el | 12 ++++++++++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 6336c33..f4754c7 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.
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index de7bfb8..105e1e4 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -2309,6 +2309,14 @@ the United States."
;;;; Reading a number using the minibuffer.
+(defun calc-digit-start-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)))))
+
(defvar calc-buffer)
(defvar calc-prev-char)
(defvar calc-prev-prev-char)
@@ -2319,7 +2327,6 @@ the United States."
(if (or calc-algebraic-mode
(and (> calc-number-radix 14) (eq last-command-event ?e)))
(calc-alg-digit-entry)
- (calc-unread-command)
(setq calc-aborted-prefix nil)
(let* ((calc-digit-value nil)
(calc-prev-char nil)
@@ -2337,7 +2344,8 @@ the United States."
(unwind-protect
(progn
(define-key global-map "\e" nil)
- (read-from-minibuffer "Calc: " "" calc-digit-map))
+ (read-from-minibuffer
+ "Calc: " (calc-digit-start-entry) calc-digit-map))
(define-key global-map "\e" old-esc))))))
(or calc-digit-value (setq calc-digit-value (math-read-number buf)))
(if (stringp calc-digit-value)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2124b33: Format initial input uniformly.,
Jay Belanger <=