* num3-mode.el: Catch strings looking like hex number even w/o 0x prefix.

[gnu-emacs-elpa] / packages / num3-mode / num3-mode.el

diff --git a/packages/num3-mode/num3-mode.el b/packages/num3-mode/num3-mode.el
index b890c89922266d47ba1e236ef1fde0c3f4cfd2f2..4e4f625e495c0c9a1206369056e84f6e9b5fbb93 100644 (file)
--- a/packages/num3-mode/num3-mode.el
+++ b/packages/num3-mode/num3-mode.el
@@ -4,8 +4,8 @@
 
 ;; Author: Felix Lee <felix8a@gmail.com>, Michal Nazarewicz <mina86@mina86.com>
 ;; Maintainer: Michal Nazarewicz <mina86@mina86.com>
-;; Keywoards: faces, minor-mode
-;; Version: 1.1
+;; Keywords: faces, minor-mode
+;; Version: 1.2
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -98,9 +98,11 @@ where) decimal point (would be) is."
 (define-globalized-minor-mode global-num3-mode num3-mode num3-mode)
 
 (defconst num3--number-re
-  (concat    "\\(?:0[xX]\\|#\\)\\([0-9a-fA-F]+\\)"  ; 1 = hexadecimal
-          "\\|\\([0-9]+\\)"                         ; 2 = decimal
-          "\\|\\.\\([0-9]+\\)"))                    ; 3 = fraction
+  (concat "[0#][xX]\\([[:xdigit:]]+\\)"       ; 1 = hexadecimal
+        "\\|\\(?1:\\b\\(?:[0-9]+[a-fA-F]\\|"  ; 1 = hexadecimal
+                 "[a-fA-F]+[0-9]\\)[[:xdigit:]]*\\b\\)"
+        "\\|\\([0-9]+\\)"                     ; 2 = decimal
+        "\\|\\.\\([0-9]+\\)"))                ; 3 = fraction
 
 (defun num3--matcher (lim)
   "Function used as a font-lock-keywoard handler used in `num3-mode'.