[Emacs-diffs] emacs-24 r117569: * lisp/progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo.

[Stefan Monnier]

------------------------------------------------------------
revno: 117569
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18622
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-10-10 00:03:27 -0400
message:
  * lisp/progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo.
  Reported by Arni Magnusson <address@hidden>.
  * lisp/progmodes/prolog.el (prolog-electric--underscore): Same.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/bat-mode.el     dos.el-20130807152307-tdflff328dlln5w6-1
  lisp/progmodes/prolog.el       prolog.el-20091113204419-o5vbwnq5f7feedwu-98

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-09 00:47:30 +0000
+++ b/lisp/ChangeLog    2014-10-10 04:03:27 +0000
@@ -1,3 +1,9 @@
+2014-10-10  Stefan Monnier  <address@hidden>
+
+       * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo
+       (bug#18622).  Reported by Arni Magnusson <address@hidden>.
+       * progmodes/prolog.el (prolog-electric--underscore): Same.
+
 2014-10-09  Glenn Morris  <address@hidden>
 
        * frame.el (display-monitor-attributes-list): Doc tweaks.

=== modified file 'lisp/progmodes/bat-mode.el'
--- a/lisp/progmodes/bat-mode.el        2014-01-01 07:43:34 +0000
+++ b/lisp/progmodes/bat-mode.el        2014-10-10 04:03:27 +0000
@@ -78,11 +78,11 @@
              "goto" "gtr" "if" "in" "leq" "lss" "neq" "not" "start"))
           (UNIX
            '("bash" "cat" "cp" "fgrep" "grep" "ls" "sed" "sh" "mv" "rm")))
-      `(("\\<_\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?"
+      `(("\\_<\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?"
          (2 font-lock-constant-face t))
         ("^:[^:].*"
          . 'bat-label-face)
-        ("\\<_\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)"
+        ("\\_<\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)"
          (2 font-lock-variable-name-face))
         ("%\\(\\w+\\)%?"
          (1 font-lock-variable-name-face))

=== modified file 'lisp/progmodes/prolog.el'
--- a/lisp/progmodes/prolog.el  2014-07-25 08:24:00 +0000
+++ b/lisp/progmodes/prolog.el  2014-10-10 04:03:27 +0000
@@ -3139,7 +3139,7 @@
                  (eq (char-before) ?_)
                  (save-excursion
                    (skip-chars-backward "[:alpha:]_")
-                   (looking-at "\\<_[_[:upper:]][[:alnum:]_]*\\_>")))
+                   (looking-at "\\_<[_[:upper:]][[:alnum:]_]*\\_>")))
         (replace-match "_")
         (skip-chars-forward ", \t\n")))))