diff options
| author | Bastien Guerry <bzg@gnu.org> | 2014-10-03 10:13:51 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2014-10-03 10:13:51 +0200 |
| commit | a81e5de3a34d27cea43d49ffdfd9755f0eddb262 (patch) | |
| tree | 94d0e2b93f054d2cc9f7f7dc5423561ea3c00a2c /lisp/org/org-compat.el | |
| parent | e197284d4789d7caa613fc406516f58fbec02547 (diff) | |
| download | emacs-a81e5de3a34d27cea43d49ffdfd9755f0eddb262.tar.gz | |
Sync with Org 8.2.8.
Diffstat (limited to 'lisp/org/org-compat.el')
| -rw-r--r-- | lisp/org/org-compat.el | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index 70c41d53cd9..90380a8806c 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -312,8 +312,7 @@ Works on both Emacs and XEmacs." (defun org-in-invisibility-spec-p (arg) "Is ARG a member of `buffer-invisibility-spec'?" (if (consp buffer-invisibility-spec) - (member arg buffer-invisibility-spec) - nil)) + (member arg buffer-invisibility-spec))) (defmacro org-xemacs-without-invisibility (&rest body) "Turn off extents with invisibility while executing BODY." @@ -347,18 +346,8 @@ Works on both Emacs and XEmacs." "Move to column COLUMN. Pass COLUMN and FORCE to `move-to-column'. Pass BUFFER to the XEmacs version of `move-to-column'." - (let* ((with-bracket-link - (save-excursion - (forward-line 0) - (looking-at (concat "^.*" org-bracket-link-regexp)))) - (buffer-invisibility-spec - (cond - ((or (not (derived-mode-p 'org-mode)) - (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)))) + (let ((buffer-invisibility-spec + (remove '(org-filtered) buffer-invisibility-spec))) (if (featurep 'xemacs) (org-xemacs-without-invisibility (move-to-column column force buffer)) |