lisp/calculator.el (calculator-last-input): drop 'ascii-character property

lookup.
etc/NEWS: calculator.el user-visible changes.

4 files changed, 17 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4419f4a0e66..fbeaed956a4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-24  Eli Barzilay  <eli@barzilay.org>
+
+        * NEWS: calculator.el user-visible changes.
+
 2014-06-15  Michael Albinus  <michael.albinus@gmx.de>
 
         * NEWS: New Tramp method "nc".
diff --git a/etc/NEWS b/etc/NEWS
index 27e9cfa0e3c..2114574b2d1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -113,6 +113,10 @@ protocols as well as for "telnet" and "ftp" are passed to Tramp.
 
 *** New connection method "nc", which allows to access dumb busyboxes.
 
+** Calculator: decimal display mode uses "," groups, so it's more
+fitting for use in money calculations; factorial works with
+non-integer inputs.
+
 ** Obsolete packages
 
 ---
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ed3d16e69f..1ce15a3c8b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-24  Eli Barzilay  <eli@barzilay.org>
+
+        * calculator.el (calculator-last-input): drop 'ascii-character property
+        lookup.
+
 2014-06-24  Leo Liu  <sdl.web@gmail.com>
 
         * align.el (align-adjust-col-for-rule): Unbreak due to defaulting
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 9ffa6b1a64b..ad7a7f4c92a 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1217,13 +1217,11 @@ Use KEYS if given, otherwise use `this-command-keys'."
       inp
       ;; Translates kp-x to x and [tries to] create a string to lookup
       ;; operators; assume all symbols are translatable via
-      ;; `function-key-map' or with an 'ascii-character property.  This
-      ;; is needed because we have key bindings for kp-* (which might be
-      ;; the wrong thing to do) so they don't get translated in
-      ;; `this-command-keys'.
+      ;; `function-key-map'.  This is needed because we have key
+      ;; bindings for kp-* (which might be the wrong thing to do) so
+      ;; they don't get translated in `this-command-keys'.
       (concat (mapcar (lambda (k)
-                        (if (numberp k) k (or (get k 'ascii-character)
-                                              (error "??bad key??"))))
+                        (if (numberp k) k (error "??bad key?? (%S)" k)))
                       (or (lookup-key function-key-map inp) inp))))))
 
 (defun calculator-clear-fragile (&optional op)