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

org.el: Fix plain link activation 

* org.el (org-activate-plain-links): Don't try to check if we
are in a bracket link already.

This partially reverts commit ad35e2.
The problem that this commit was trying to
address needs to be rethought.

Thanks to Scott Randby for reporting this.
This commit is contained in:
Bastien Guerry 2012-09-13 03:10:06 +02:00
parent c6d0af8c5b
commit b0e5c6d1ad
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lisp/org.el
View File

@ -5450,24 +5450,18 @@ 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
(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)
(and (listp f) (memq 'org-tag f)))
nil
(add-text-properties (match-beginning 0) (match-end 0)
(list 'mouse-face 'highlight
'face 'org-link
'keymap org-mouse-map))
(org-rear-nonsticky-at (match-end 0)))
t)))))
(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)
(and (listp f) (memq 'org-tag f)))
nil
(add-text-properties (match-beginning 0) (match-end 0)
(list 'mouse-face 'highlight
'face 'org-link
'keymap org-mouse-map))
(org-rear-nonsticky-at (match-end 0)))
t))))
(defun org-activate-code (limit)
(if (re-search-forward "^[ \t]*\\(:\\(?: .*\\|$\\)\n?\\)" limit t)