summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-26 22:02:25 +0100
committerBastien Guerry <bzg@altern.org>2013-02-26 22:02:25 +0100
commitebe0fbd6a8ea763c86784bb3e6a2b14109e9b1d7 (patch)
treeee9cfca5498ccb517ad697f887e1a4372ad1863a
parent5bdb84ba74943fed211a355245de5924bacd1bbc (diff)
parent2b13d090d124fe6a7a389def71696c3b477bf8f6 (diff)
downloadorg-mode-ebe0fbd6a8ea763c86784bb3e6a2b14109e9b1d7.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 8a5e7be..5f707ff 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -23002,7 +23002,7 @@ Show the heading too, if it is currently invisible."
(re (concat "^" (org-get-limited-outline-regexp)))
(subs (make-vector (1+ n) nil))
(last-level 0)
- m level head)
+ m level head0 head)
(save-excursion
(save-restriction
(widen)
@@ -23010,9 +23010,9 @@ Show the heading too, if it is currently invisible."
(while (re-search-backward re nil t)
(setq level (org-reduced-level (funcall outline-level)))
(when (and (<= level n)
- (looking-at org-complex-heading-regexp))
- (setq head (org-link-display-format
- (org-match-string-no-properties 4))
+ (looking-at org-complex-heading-regexp)
+ (setq head0 (org-match-string-no-properties 4)))
+ (setq head (org-link-display-format head0)
m (org-imenu-new-marker))
(org-add-props head nil 'org-imenu-marker m 'org-imenu t)
(if (>= level last-level)