1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-28 19:42:02 +00:00

* 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
This commit is contained in:
Stefan Monnier 2014-10-10 00:03:27 -04:00
parent ad1ababf7f
commit 4b9d951ee1
3 changed files with 9 additions and 3 deletions

View 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.

View File

@ -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))

View 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")))))