Merge from origin/emacs-25

[gnu-emacs] / lisp / calc / calc-aent.el

diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 23de53e0f0c6fd8e7a74086419607c7370f92547..37874b2fde0285b9fb2249888b47b7abc397a8ec 100644 (file)
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1,9 +1,8 @@
 ;;; calc-aent.el --- algebraic entry functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
@@ -30,6 +29,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 +450,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.
@@ -1057,7 +1052,7 @@ If the current Calc language does not use placeholders, return nil."
 (defun math-read-if (cond op)
   (let ((then (math-read-expr-level 0)))
     (or (equal math-expr-data ":")
-       (throw 'syntax "Expected ':'"))
+       (throw 'syntax "Expected `:'"))
     (math-read-token)
     (list 'calcFunc-if cond then (math-read-expr-level (nth 3 op)))))
 
@@ -1177,7 +1172,7 @@ If the current Calc language does not use placeholders, return nil."
                          (setq el (cdr el))))
                     (if (equal math-expr-data "]")
                         (math-read-token)
-                      (throw 'syntax "Expected ']'")))
+                      (throw 'syntax "Expected `]'")))
                   val)))))
          ((eq math-exp-token 'dollar)
           (let ((abs (if (> math-expr-data 0) math-expr-data (- math-expr-data))))
@@ -1266,7 +1261,6 @@ If the current Calc language does not use placeholders, return nil."
 (provide 'calc-aent)
 
 ;; Local variables:
-;; coding: utf-8
 ;; generated-autoload-file: "calc-loaddefs.el"
 ;; End: