(math-read-number): Handle C-like languages properly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c860387517a13bcadf8e25af5257275daeb0d8e6..ed10a856484f1157019be1a310dd1f428c0f0ee3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-05  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc/calc.el (math-read-number): Handle all C-like languages
+       properly.
+
+2008-08-04  Vincent Belaïche  <vincent.b.1@hotmail.fr>
+
+       * calc/calc.el (math-read-number): Handle C numbers beginning with
+       0 correctly.
+
 2008-07-27  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
        * term/ns-win.el ([ns-new-frame]): New global key.

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index a4a6387296b9b354c0c3adabf8183f525f506e98..4b16209915e5c376561ab97dee7d1c129a094182 100644 (file)
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -3463,7 +3463,7 @@ largest Emacs integer.")
     ;; Integers (most common case)
     ((string-match "\\` *\\([0-9]+\\) *\\'" s)
      (let ((digs (math-match-substring s 1)))
-       (if (and (eq calc-language 'c)
+       (if (and (memq calc-language calc-lang-c-type-hex)
                (> (length digs) 1)
                (eq (aref digs 0) ?0)
                 (null decimal))