diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-04-18 19:38:10 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-04-18 19:38:10 +0200 |
commit | b35b9914e6334e340948f52b02cbc772c06f91c3 (patch) | |
tree | c3655449070a2e902c64f1db735b9b633cd6c964 | |
parent | c2e5b13a2d214210971044c267b96d6119f9ce85 (diff) | |
download | org-mode-b35b9914e6334e340948f52b02cbc772c06f91c3.tar.gz |
Revert "Use `add-to-invisibility-spec' directly"
This reverts commit c2e5b13a2d214210971044c267b96d6119f9ce85.
-rw-r--r-- | contrib/ChangeLog | 4 | ||||
-rw-r--r-- | contrib/babel/lisp/org-babel.el | 4 | ||||
-rwxr-xr-x | lisp/ChangeLog | 10 | ||||
-rw-r--r-- | lisp/org-compat.el | 13 | ||||
-rw-r--r-- | lisp/org-table.el | 2 | ||||
-rw-r--r-- | lisp/org.el | 8 |
6 files changed, 20 insertions, 21 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 4f42b55..181ab0d 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,9 +1,5 @@ 2010-04-18 Carsten Dominik <carsten.dominik@gmail.com> - * babel/lisp/org-babel.el (org-babel-hide-hash): Use - `add-to-invisibility-spec'. - (org-babel-result-hide-spec): - * lisp/org-learn.el (require): `calendar' is now required already by org.el on top level. diff --git a/contrib/babel/lisp/org-babel.el b/contrib/babel/lisp/org-babel.el index 12a5be4..b348503 100644 --- a/contrib/babel/lisp/org-babel.el +++ b/contrib/babel/lisp/org-babel.el @@ -394,7 +394,7 @@ added to the header-arguments-alist." "Hide the hash in the current results line. Only the initial `org-babel-hash-show' characters of the hash will remain visible." - (add-to-invisibility-spec '(org-babel-hide-hash . t)) + (org-add-to-invisibility-spec '(org-babel-hide-hash . t)) (save-excursion (when (and (re-search-forward org-babel-result-regexp nil t) (match-string 3)) @@ -432,7 +432,7 @@ with C-c C-c." (add-hook 'org-ctrl-c-ctrl-c-hook 'org-babel-hash-at-point) (defun org-babel-result-hide-spec () - (add-to-invisibility-spec '(org-babel-hide-result . t))) + (org-add-to-invisibility-spec '(org-babel-hide-result . t))) (add-hook 'org-mode-hook 'org-babel-result-hide-spec) (defvar org-babel-hide-result-overlays nil diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eeee21f..25839f5 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,15 +1,5 @@ 2010-04-18 Carsten Dominik <carsten.dominik@gmail.com> - * org.el (org-mode, org-org-menu): Use `add-to-invisibility-spec'. - - * org-table.el (orgtbl-mode): Use `add-to-invisibility-spec'. - - * org-compat.el (org-make-overlay, org-delete-overlay) - (org-overlay-start, org-overlay-end, org-overlay-put) - (org-overlay-get, org-overlay-move, org-overlay-buffer): Functions - removed. - (org-add-to-invisibility-spec): Function removed. - * org-html.el (org-export-as-html-and-open): Add argument to kill-buffer. diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 3daff84..e226923 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -182,6 +182,19 @@ Works on both Emacs and XEmacs." ;; Invisibility compatibility +(defun org-add-to-invisibility-spec (arg) + "Add elements to `buffer-invisibility-spec'. +See documentation for `buffer-invisibility-spec' for the kind of elements +that can be added." + (cond + ((fboundp 'add-to-invisibility-spec) + (add-to-invisibility-spec arg)) + ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t)) + (setq buffer-invisibility-spec (list arg))) + (t + (setq buffer-invisibility-spec + (cons arg buffer-invisibility-spec))))) + (defun org-remove-from-invisibility-spec (arg) "Remove elements from `buffer-invisibility-spec'." (if (fboundp 'remove-from-invisibility-spec) diff --git a/lisp/org-table.el b/lisp/org-table.el index c2df706..b189818 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3454,7 +3454,7 @@ table editor in arbitrary modes.") (concat orgtbl-line-start-regexp "\\|" auto-fill-inhibit-regexp) orgtbl-line-start-regexp)) - (add-to-invisibility-spec '(org-cwidth)) + (org-add-to-invisibility-spec '(org-cwidth)) (when (fboundp 'font-lock-add-keywords) (font-lock-add-keywords nil orgtbl-extra-font-lock-keywords) (org-restart-font-lock)) diff --git a/lisp/org.el b/lisp/org.el index 16c1f91..7cad962 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4365,9 +4365,9 @@ The following commands are available: (easy-menu-add org-org-menu) (easy-menu-add org-tbl-menu) (org-install-agenda-files-menu) - (if org-descriptive-links (add-to-invisibility-spec '(org-link))) - (add-to-invisibility-spec '(org-cwidth)) - (add-to-invisibility-spec '(org-hide-block . t)) + (if org-descriptive-links (org-add-to-invisibility-spec '(org-link))) + (org-add-to-invisibility-spec '(org-cwidth)) + (org-add-to-invisibility-spec '(org-hide-block . t)) (when (featurep 'xemacs) (org-set-local 'line-move-ignore-invisible t)) (org-set-local 'outline-regexp org-outline-regexp) @@ -16687,7 +16687,7 @@ See the individual commands for more information." ["Previous link" org-previous-link t] "--" ["Descriptive Links" - (progn (add-to-invisibility-spec '(org-link)) (org-restart-font-lock)) + (progn (org-add-to-invisibility-spec '(org-link)) (org-restart-font-lock)) :style radio :selected (member '(org-link) buffer-invisibility-spec)] ["Literal Links" |