diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-10 00:03:27 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-10 00:03:27 -0400 |
| commit | 4b9d951ee1abd65dd6335300e764d0d8a368871f (patch) | |
| tree | 1d951e46c42e1ba2fd1d127aaa30efcdeca96a33 | |
| parent | ad1ababf7fdf791e53b7e069f6f5a42f1583db77 (diff) | |
| download | emacs-4b9d951ee1abd65dd6335300e764d0d8a368871f.tar.gz | |
* lisp/progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo.
Reported by Arni Magnusson <arnima@hafro.is>.
* lisp/progmodes/prolog.el (prolog-electric--underscore): Same.
Fixes: debbugs:18622
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/bat-mode.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/prolog.el | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6831c0efb42..2abbf728ba5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el index e328cfa0d8b..266c24adcca 100644 --- a/lisp/progmodes/bat-mode.el +++ b/lisp/progmodes/bat-mode.el @@ -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)) diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 07d88b3f0fb..42904720d63 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -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"))))) |