Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-07-03 16:01:14 +02:00
commit 74974ab34b
1 changed files with 4 additions and 3 deletions

View File

@ -14180,9 +14180,10 @@ When DOWNCASE is non-nil, expand downcased TAGS."
(modify-syntax-entry ?@ "w" stable) (modify-syntax-entry ?@ "w" stable)
(modify-syntax-entry ?_ "w" stable) (modify-syntax-entry ?_ "w" stable)
(while (and tml (while (and tml
(with-syntax-table stable
(string-match (string-match
(concat "\\(?1:[+-]?\\)\\(?2:\\<" (concat "\\(?1:[+-]?\\)\\(?2:\\<"
(regexp-opt tml) "\\>\\)") rtnmatch)) (regexp-opt tml) "\\>\\)") rtnmatch)))
(let* ((dir (match-string 1 rtnmatch)) (let* ((dir (match-string 1 rtnmatch))
(tag (match-string 2 rtnmatch)) (tag (match-string 2 rtnmatch))
(tag (if downcased (downcase tag) tag))) (tag (if downcased (downcase tag) tag)))