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 2014-03-25 12:04:19 +01:00
parent 6289868d28 0e344ae04a
commit 4cf2b55cb0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/org-compat.el
View File

@ -347,18 +347,18 @@ Works on both Emacs and XEmacs."
"Move to column COLUMN. "Move to column COLUMN.
Pass COLUMN and FORCE to `move-to-column'. Pass COLUMN and FORCE to `move-to-column'.
Pass BUFFER to the XEmacs version of `move-to-column'." Pass BUFFER to the XEmacs version of `move-to-column'."
(let ((buffer-invisibility-spec (let* ((with-bracket-link
(if (or (save-excursion
;; Ignore all visibility spec in agenda
(not (derived-mode-p 'org-mode))
;; Ignore bracket links elsewere
(and (save-excursion
(forward-line 0) (forward-line 0)
(looking-at (concat "^.*" org-bracket-link-regexp))) (looking-at (concat "^.*" org-bracket-link-regexp))))
(member '(org-link) (buffer-invisibility-spec
buffer-invisibility-spec))) (cond
t ((or (not (derived-mode-p 'org-mode))
buffer-invisibility-spec))) (and with-bracket-link (org-invisible-p2)))
(remove '(org-link) buffer-invisibility-spec))
(with-bracket-link
(remove t buffer-invisibility-spec))
(t buffer-invisibility-spec))))
(if (featurep 'xemacs) (if (featurep 'xemacs)
(org-xemacs-without-invisibility (org-xemacs-without-invisibility
(move-to-column column force buffer)) (move-to-column column force buffer))