summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-27 18:14:16 +0100
committerBastien Guerry <bzg@altern.org>2013-02-27 18:14:16 +0100
commita002158b9f52b1526cc2f802a11d02d2ca2b07d1 (patch)
tree730a0db85216826d5afa0c4c17d3dd419a658f9b
parent6cc600d074f7fd502cef265b1873f85292ad62cf (diff)
parent8e22aafe9a8a1206490932cdde5c9f66f1dfefb1 (diff)
downloadorg-mode-a002158b9f52b1526cc2f802a11d02d2ca2b07d1.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org.el b/lisp/org.el
index b88b49a..7cf7832 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5830,15 +5830,15 @@ by a #."
(if (and (re-search-forward org-tsr-regexp-both limit t)
(not (equal (char-before (match-beginning 0)) 91)))
(progn
- (org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1))
- (add-text-properties (match-beginning 1) (match-end 1)
+ (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
+ (add-text-properties (match-beginning 0) (match-end 0)
(list 'mouse-face 'highlight
'keymap org-mouse-map))
- (org-rear-nonsticky-at (match-end 1))
+ (org-rear-nonsticky-at (match-end 0))
(when org-display-custom-times
- (if (match-end 4)
- (org-display-custom-time (match-beginning 4) (match-end 4)))
- (org-display-custom-time (match-beginning 2) (match-end 2)))
+ (if (match-end 3)
+ (org-display-custom-time (match-beginning 3) (match-end 3)))
+ (org-display-custom-time (match-beginning 1) (match-end 1)))
t)))
(defvar org-target-link-regexp nil