ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-13 03:20:30 +02:00
parent 93c692ba27 b0e5c6d1ad
commit 6589b9925c
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org.el
View File

@ -5455,13 +5455,7 @@ will be prompted for."
"Run through the buffer and add overlays to links."
(catch 'exit
(let (f)
(if (and (re-search-forward (concat org-plain-link-re) limit t)
(or (not (member 'bracket org-activate-links))
(save-excursion
(save-match-data
(goto-char (match-beginning 0))
(not (looking-back "\\[\\["))))))
(progn
(when (re-search-forward (concat org-plain-link-re) limit t)
(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
(setq f (get-text-property (match-beginning 0) 'face))
(if (or (eq f 'org-tag)
@ -5472,7 +5466,7 @@ will be prompted for."
'face 'org-link
'keymap org-mouse-map))
(org-rear-nonsticky-at (match-end 0)))
t)))))
t))))
(defun org-activate-code (limit)
(if (re-search-forward "^[ \t]*\\(:\\(?: .*\\|$\\)\n?\\)" limit t)