From a5e025ce627790d7b24bab47a838cb5bec0baa79 Mon Sep 17 00:00:00 2001
From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Tue, 5 Aug 2008 03:45:22 +0000
Subject: [PATCH] (math-read-number): Handle C-like languages properly.

---
 lisp/ChangeLog    | 10 ++++++++++
 lisp/calc/calc.el |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c860387517a..ed10a856484 100644
--- 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 a4a6387296b..4b16209915e 100644
--- 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))
-- 
2.39.2