]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 10 Oct 2014 04:03:27 +0000 (00:03 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 10 Oct 2014 04:03:27 +0000 (00:03 -0400)
Reported by Arni Magnusson <arnima@hafro.is>.
* lisp/progmodes/prolog.el (prolog-electric--underscore): Same.

Fixes: debbugs:18622
lisp/ChangeLog
lisp/progmodes/bat-mode.el
lisp/progmodes/prolog.el

index 6831c0efb421e76166dbe1f1a8a29e829ea2d2d0..2abbf728ba517902831a41d749f3c2a5f3c0bd19 100644 (file)
@@ -1,3 +1,9 @@
+2014-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo
+       (bug#18622).  Reported by Arni Magnusson <arnima@hafro.is>.
+       * progmodes/prolog.el (prolog-electric--underscore): Same.
+
 2014-10-09  Glenn Morris  <rgm@gnu.org>
 
        * frame.el (display-monitor-attributes-list): Doc tweaks.
index e328cfa0d8bb6d1800653fc93cfdc328dc1306f2..266c24adccae6e570d1a79f5eb288ef899d9d013 100644 (file)
              "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))
index 07d88b3f0fb9a6a369937e285c72d0ef7ae50ea1..42904720d6336450977a1e895c82cbc138d54e70 100644 (file)
@@ -3139,7 +3139,7 @@ the following comma and whitespace, if any."
                  (eq (char-before) ?_)
                  (save-excursion
                    (skip-chars-backward "[:alpha:]_")
-                   (looking-at "\\<_[_[:upper:]][[:alnum:]_]*\\_>")))
+                   (looking-at "\\_<[_[:upper:]][[:alnum:]_]*\\_>")))
         (replace-match "_")
         (skip-chars-forward ", \t\n")))))