[Emacs-diffs] emacs-26 29520b0: Fix quick-calc in C mode with hex values

[Eli Zaretskii]

branch: emacs-26
commit 29520b083f4bddbf5f7d3bbf0b3d30f31025f4f8
Author: OGAWA Hirofumi <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix quick-calc in C mode with hex values
    
    * lisp/calc/calc-aent.el (math-read-token): Make sure the match
    against "0[xX][0-9a-fA-F]+" is found at math-exp-pos.  See
    http://lists.gnu.org/archive/html/emacs-devel/2017-11/msg00174.html
    for the details.
    
    Copyright-paperwork-exempt: yes
---
 lisp/calc/calc-aent.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index f70a6d0..997ac3d 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -728,7 +728,9 @@ in Calc algebraic input.")
                                                 math-exp-str (1- math-exp-pos))
                                   (1- math-exp-pos))))))
             (or (and (memq calc-language calc-lang-c-type-hex)
-                     (string-match "0[xX][0-9a-fA-F]+" math-exp-str 
math-exp-pos))
+                     (eq (string-match "0[xX][0-9a-fA-F]+" math-exp-str
+                                        math-exp-pos)
+                          math-exp-pos))
                 (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' 
*\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#[#]?\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#[#]?\\|\\^\\^\\)[0-9a-zA-Zα-ωΑ-Ω:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?"
                                math-exp-str math-exp-pos))
             (setq math-exp-token 'number