Merge branch 'maint'
This commit is contained in:
commit
4cf2b55cb0
|
@ -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
|
(forward-line 0)
|
||||||
(not (derived-mode-p 'org-mode))
|
(looking-at (concat "^.*" org-bracket-link-regexp))))
|
||||||
;; Ignore bracket links elsewere
|
(buffer-invisibility-spec
|
||||||
(and (save-excursion
|
(cond
|
||||||
(forward-line 0)
|
((or (not (derived-mode-p 'org-mode))
|
||||||
(looking-at (concat "^.*" org-bracket-link-regexp)))
|
(and with-bracket-link (org-invisible-p2)))
|
||||||
(member '(org-link)
|
(remove '(org-link) buffer-invisibility-spec))
|
||||||
buffer-invisibility-spec)))
|
(with-bracket-link
|
||||||
t
|
(remove t buffer-invisibility-spec))
|
||||||
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))
|
||||||
|
|
Loading…
Reference in New Issue