summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-07-03 14:01:14 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-07-03 14:01:14 (GMT)
commit74974ab34b7cf31add28cdb3f6d9fce8009eda34 (patch)
treef6e90d1c4929dff39083cd0b4e37651d21052255
parent0b51434a010a151b2dcc4077496d459105ba9f92 (diff)
parentf0c2a680568009ad2f93020af8134dbd481070e2 (diff)
downloadorg-mode-74974ab34b7cf31add28cdb3f6d9fce8009eda34.zip
org-mode-74974ab34b7cf31add28cdb3f6d9fce8009eda34.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index cfbc5b6..8ce1220 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14180,9 +14180,10 @@ When DOWNCASE is non-nil, expand downcased TAGS."
(modify-syntax-entry ?@ "w" stable)
(modify-syntax-entry ?_ "w" stable)
(while (and tml
- (string-match
- (concat "\\(?1:[+-]?\\)\\(?2:\\<"
- (regexp-opt tml) "\\>\\)") rtnmatch))
+ (with-syntax-table stable
+ (string-match
+ (concat "\\(?1:[+-]?\\)\\(?2:\\<"
+ (regexp-opt tml) "\\>\\)") rtnmatch)))
(let* ((dir (match-string 1 rtnmatch))
(tag (match-string 2 rtnmatch))
(tag (if downcased (downcase tag) tag)))