diff options
author | Kyle Meyer <kyle@kyleam.com> | 2015-09-27 11:45:07 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2015-10-04 02:31:16 -0400 |
commit | ef3ea9d02d16128989d5d5129073386397dca1ec (patch) | |
tree | 6756cecfd181bc6f3205032a942ad36d76b8d989 | |
parent | 2c349cc65a36010cf17ce971f42a2829863359dd (diff) | |
download | org-mode-ef3ea9d02d16128989d5d5129073386397dca1ec.tar.gz |
Use prefix for outline functions
* lisp/ob-lilypond.el (org-babel-lilypond-mark-error-line):
* lisp/org-agenda.el (org-agenda-goto):
(org-agenda-show-and-scroll-up):
(org-agenda-show-1):
* lisp/org-archive.el (org-archive-subtree):
(org-archive-to-archive-sibling):
(org-toggle-archive-tag):
* lisp/org-capture.el:
(org-capture-place-template):
* lisp/org-colview.el:
(org-columns-eval):
* lisp/org-crypt.el (org-encrypt-entry):
* lisp/org-feed.el (org-feed-update):
* lisp/org-mouse.el (org-mouse-popup-global-menu):
* lisp/org.el (org-cycle):
(org-cycle-internal-global):
(org-cycle-internal-local):
(org-global-cycle):
(org-set-startup-visibility):
(org-set-visibility-according-to-property):
(org-overview):
(org-content):
(org-clean-visibility-after-subtree-move):
(org-set-outline-overlay-data):
(org-tree-to-indirect-buffer):
(org-move-subtree-down):
(org-paste-subtree):
(org-sort-entries):
(orgstruct-setup):
(org-show-set-visibility):
(org-mode-map):
(org-check-before-invisible-edit):
(org-kill-note-or-show-branches):
(org-org-menu):
(org-yank-generic):
* lisp/ox-org.el (org-org-publish-to-org): Use prefix for outline
functions.
* lisp/org-compat.el: Add compatibility functions for outline functions
that are under the "outline-" prefix as of Emacs 25.
-rw-r--r-- | lisp/ob-core.el | 2 | ||||
-rw-r--r-- | lisp/ob-lilypond.el | 2 | ||||
-rw-r--r-- | lisp/org-agenda.el | 16 | ||||
-rw-r--r-- | lisp/org-archive.el | 8 | ||||
-rw-r--r-- | lisp/org-capture.el | 2 | ||||
-rw-r--r-- | lisp/org-colview.el | 2 | ||||
-rw-r--r-- | lisp/org-compat.el | 12 | ||||
-rw-r--r-- | lisp/org-crypt.el | 2 | ||||
-rw-r--r-- | lisp/org-feed.el | 4 | ||||
-rw-r--r-- | lisp/org-mouse.el | 2 | ||||
-rwxr-xr-x | lisp/org.el | 64 | ||||
-rw-r--r-- | lisp/ox-org.el | 2 |
12 files changed, 65 insertions, 53 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 9545871..61753ce 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -37,7 +37,7 @@ (defvar org-babel-call-process-region-original nil) (defvar org-src-lang-modes) (defvar org-babel-library-of-babel) -(declare-function show-all "outline" ()) +(declare-function outline-show-all "outline" ()) (declare-function org-every "org" (pred seq)) (declare-function org-remove-indentation "org" (code &optional n)) (declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS)) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index eba8423..f1d732c 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -265,7 +265,7 @@ LINE is the erroneous line" (setq case-fold-search nil) (if (search-forward line nil t) (progn - (show-all) + (outline-show-all) (set-mark (point)) (goto-char (- (point) (length line)))) (goto-char temp)))) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 0725d9e..e12a142 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -8408,7 +8408,7 @@ When called with a prefix argument, include all archive files as well." (and (outline-next-heading) (org-flag-heading nil))) ; show the next heading (when (outline-invisible-p) - (show-entry)) ; display invisible text + (outline-show-entry)) ; display invisible text (recenter (/ (window-height) 2)) (org-back-to-heading t) (if (re-search-forward org-complex-heading-regexp nil t) @@ -8665,7 +8665,7 @@ folded." (select-window org-agenda-show-window) (ignore-errors (scroll-up))) (org-agenda-goto t) - (if arg (org-show-entry) (show-subtree)) + (if arg (org-show-entry) (outline-show-subtree)) (setq org-agenda-show-window (selected-window))) (select-window win))) @@ -8697,7 +8697,7 @@ if it was hidden in the outline." (set-window-start (selected-window) (point-at-bol)) (cond ((= more 0) - (hide-subtree) + (outline-hide-subtree) (save-excursion (org-back-to-heading) (run-hook-with-args 'org-cycle-hook 'folded)) @@ -8705,26 +8705,26 @@ if it was hidden in the outline." ((and (org-called-interactively-p 'any) (= more 1)) (message "Remote: show with default settings")) ((= more 2) - (show-entry) - (show-children) + (outline-show-entry) + (outline-show-children) (save-excursion (org-back-to-heading) (run-hook-with-args 'org-cycle-hook 'children)) (message "Remote: CHILDREN")) ((= more 3) - (show-subtree) + (outline-show-subtree) (save-excursion (org-back-to-heading) (run-hook-with-args 'org-cycle-hook 'subtree)) (message "Remote: SUBTREE")) ((= more 4) - (show-subtree) + (outline-show-subtree) (save-excursion (org-back-to-heading) (org-cycle-hide-drawers 'subtree '("LOGBOOK"))) (message "Remote: SUBTREE AND LOGBOOK")) ((> more 4) - (show-subtree) + (outline-show-subtree) (message "Remote: SUBTREE AND ALL DRAWERS"))) (select-window win))) diff --git a/lisp/org-archive.el b/lisp/org-archive.el index 2919fda..170bfd7 100644 --- a/lisp/org-archive.el +++ b/lisp/org-archive.el @@ -317,7 +317,7 @@ this heading." org-odd-levels-only tr-org-odd-levels-only))) (goto-char (point-min)) - (show-all) + (outline-show-all) (if (and heading (not (and datetree-date (not datetree-subheading-p)))) (progn (if (re-search-forward @@ -332,7 +332,7 @@ this heading." (insert (if datetree-date "" "\n") heading "\n") (end-of-line 0)) ;; Make the subtree visible - (show-subtree) + (outline-show-subtree) (if org-archive-reversed-order (progn (org-back-to-heading t) @@ -454,7 +454,7 @@ sibling does not exist, it will be created at the end of the subtree." (format-time-string (substring (cdr org-time-stamp-formats) 1 -1))) (outline-up-heading 1 t) - (hide-subtree) + (outline-hide-subtree) (org-cycle-show-empty-lines 'folded) (goto-char pos))) (org-reveal) @@ -565,7 +565,7 @@ the children that do not contain any open TODO items." (save-excursion (org-back-to-heading t) (setq set (org-toggle-tag org-archive-tag)) - (when set (hide-subtree))) + (when set (outline-hide-subtree))) (and set (beginning-of-line 1)) (message "Subtree %s" (if set "archived" "unarchived")))))) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 67dc319..fe04fc5 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1006,7 +1006,7 @@ may have been stored before." (org-switch-to-buffer-other-window (org-capture-get-indirect-buffer (org-capture-get :buffer) "CAPTURE")) (widen) - (show-all) + (outline-show-all) (goto-char (org-capture-get :pos)) (org-set-local 'org-capture-target-marker (point-marker)) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 3838531..14c8f49 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -548,7 +548,7 @@ Where possible, use the standard interface for changing this line." (condition-case nil (org-no-warnings (next-line 1)) (error nil)) (setq hidep (org-at-heading-p 1))) (eval form) - (and hidep (hide-entry)))) + (and hidep (outline-hide-entry)))) (defun org-columns-previous-allowed-value () "Switch to the previous allowed value for this column." diff --git a/lisp/org-compat.el b/lisp/org-compat.el index d4dcdff..e7518d8 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -539,6 +539,18 @@ Implements `file-equal-p' for older emacsen and XEmacs." (buffer-narrowed-p) (/= (- (point-max) (point-min)) (buffer-size)))) +;; As of Emacs 25.1, `outline-mode` functions are under the 'outline-' +;; prefix. +(when (< emacs-major-version 25) + (defalias 'outline-show-all 'show-all) + (defalias 'outline-hide-subtree 'hide-subtree) + (defalias 'outline-show-subtree 'show-subtree) + (defalias 'outline-show-branches 'show-branches) + (defalias 'outline-show-children 'show-children) + (defalias 'outline-show-entry 'show-entry) + (defalias 'outline-hide-entry 'hide-entry) + (defalias 'outline-hide-sublevels 'hide-sublevels)) + (defmacro org-with-silent-modifications (&rest body) (if (fboundp 'with-silent-modifications) `(with-silent-modifications ,@body) diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 59804a5..abe9f3c 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -191,7 +191,7 @@ See `org-crypt-disable-auto-save'." (insert encrypted-text) (when folded (goto-char start-heading) - (hide-subtree)) + (outline-hide-subtree)) nil))))) (defun org-decrypt-entry () diff --git a/lisp/org-feed.el b/lisp/org-feed.el index 707db41..e9decf7 100644 --- a/lisp/org-feed.el +++ b/lisp/org-feed.el @@ -406,8 +406,8 @@ it can be a list structured like an entry in `org-feed-alist'." ;; Normalize the visibility of the inbox tree (goto-char inbox-pos) - (hide-subtree) - (show-children) + (outline-hide-subtree) + (outline-show-children) (org-cycle-hide-drawers 'children) ;; Hooks and messages diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index c2fa46a..6095094 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -497,7 +497,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:" `("Main Menu" ["Show Overview" org-mouse-show-overview t] ["Show Headlines" org-mouse-show-headlines t] - ["Show All" show-all t] + ["Show All" outline-show-all t] ["Remove Highlights" org-remove-occur-highlights :visible org-occur-highlights] "--" diff --git a/lisp/org.el b/lisp/org.el index 8209d98..c703b63 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -6748,7 +6748,7 @@ show the entire buffer, including any drawers. (org-unlogged-message "Startup visibility, plus VISIBILITY properties")) ((equal arg '(64)) - (show-all) + (outline-show-all) (org-unlogged-message "Entire buffer visible, including drawers")) ;; Try cdlatex TAB completion @@ -6847,7 +6847,7 @@ Use \\[org-edit-special] to edit table.el tables")) (eq org-cycle-global-status 'contents)) ;; We just showed the table of contents - now show everything (run-hook-with-args 'org-pre-cycle-hook 'all) - (show-all) + (outline-show-all) (unless ga (org-unlogged-message "SHOW ALL")) (setq org-cycle-global-status 'all) (run-hook-with-args 'org-cycle-hook 'all)) @@ -6923,7 +6923,7 @@ Use \\[org-edit-special] to edit table.el tables")) (if (org-at-item-p) (org-list-set-item-visibility (point-at-bol) struct 'children) (org-show-entry) - (org-with-limited-levels (show-children)) + (org-with-limited-levels (outline-show-children)) ;; FIXME: This slows down the func way too much. ;; How keep drawers hidden in subtree anyway? ;; (when (memq 'org-cycle-hide-drawers org-cycle-hook) @@ -6981,8 +6981,8 @@ With a numeric prefix, show all headlines up to that level." (if (derived-mode-p 'org-mode) org-cycle-include-plain-lists nil))) (cond ((integerp arg) - (show-all) - (hide-sublevels arg) + (outline-show-all) + (outline-hide-sublevels arg) (setq org-cycle-global-status 'contents)) ((equal arg '(4)) (org-set-startup-visibility) @@ -6999,7 +6999,7 @@ With a numeric prefix, show all headlines up to that level." (org-content)) ((or (eq org-startup-folded 'showeverything) (eq org-startup-folded nil)) - (show-all))) + (outline-show-all))) (unless (eq org-startup-folded 'showeverything) (if org-hide-block-startup (org-hide-block-all)) (org-set-visibility-according-to-property 'no-cleanup) @@ -7018,21 +7018,21 @@ With a numeric prefix, show all headlines up to that level." (let ((state (match-string 3))) (save-excursion (org-back-to-heading t) - (hide-subtree) + (outline-hide-subtree) (org-reveal) (cond ((equal state "folded") - (hide-subtree)) + (outline-hide-subtree)) ((equal state "children") (org-show-hidden-entry) - (show-children)) + (outline-show-children)) ((equal state "content") (save-excursion (save-restriction (org-narrow-to-subtree) (org-content)))) ((member state '("all" "showall")) - (show-subtree))))))) + (outline-show-subtree))))))) (unless no-cleanup (org-cycle-hide-archived-subtrees 'all) (org-cycle-hide-drawers 'all) @@ -7056,7 +7056,7 @@ results." (progn (goto-char (match-beginning 0)) (funcall outline-level)))))) - (and level (hide-sublevels level))))) + (and level (outline-hide-sublevels level))))) (defun org-content (&optional arg) "Show all headlines in the buffer, like a table of contents. @@ -7074,8 +7074,8 @@ With numerical argument N, show content up to level N." t) (looking-at org-outline-regexp)) (if (integerp arg) - (show-children (1- arg)) - (show-branches)) + (outline-show-children (1- arg)) + (outline-show-branches)) (if (bobp) (throw 'exit nil)))))) (defun org-optimize-window-after-visibility-change (state) @@ -7126,7 +7126,7 @@ This function is the default value of the hook `org-cycle-hook'." (if (and (not (outline-invisible-p)) (save-excursion (goto-char (point-at-eol)) (outline-invisible-p))) - (hide-entry)))) + (outline-hide-entry)))) (org-cycle-show-empty-lines 'overview) (org-cycle-hide-drawers 'overview))))) @@ -7290,7 +7290,7 @@ DATA should have been made by `org-outline-overlay-data'." (save-excursion (save-restriction (widen) - (show-all) + (outline-show-all) (mapc (lambda (c) (outline-flag-region (car c) (cdr c) t)) data))))) @@ -7675,7 +7675,7 @@ frame is not changed." (if (featurep 'xemacs) (save-excursion (org-mode) (turn-on-font-lock))) (narrow-to-region beg end) - (show-all) + (outline-show-all) (goto-char pos) (run-hook-with-args 'org-cycle-hook 'all) (and (window-live-p cwin) (select-window cwin)))) @@ -8475,9 +8475,9 @@ case." (insert (make-string (- ne-ins ne-beg) ?\n))) (move-marker ins-point nil) (if folded - (hide-subtree) + (outline-hide-subtree) (org-show-entry) - (show-children) + (outline-show-children) (org-cycle-hide-drawers 'children)) (org-clean-visibility-after-subtree-move) ;; move back to the initial column we were at @@ -8646,7 +8646,7 @@ When REMOVE is non-nil, remove the subtree from the clipboard." (eq org-subtree-clip (current-kill 0)) org-subtree-clip-folded) ;; The tree was folded before it was killed/copied - (hide-subtree)) + (outline-hide-subtree)) (and for-yank (goto-char newend)) (and remove (setq kill-ring (cdr kill-ring)))))) @@ -8945,7 +8945,7 @@ When sorting is done, call `org-after-sorting-entries-or-items-hook'." (point)) what "children") (goto-char start) - (show-subtree) + (outline-show-subtree) (outline-next-heading)) (t ;; we will sort the top-level entries in this file @@ -8961,7 +8961,7 @@ When sorting is done, call `org-after-sorting-entries-or-items-hook'." (setq end (point-max)) (setq what "top-level") (goto-char start) - (show-all))) + (outline-show-all))) (setq beg (point)) (when (>= beg end) (goto-char start) (user-error "Nothing to sort")) @@ -9242,7 +9242,7 @@ buffer. It will also recognize item context in multiline items." outline-previous-visible-heading outline-promote outline-up-heading - show-children)) + outline-show-children)) (let ((f (or (car-safe cell) cell)) (disable-when-heading-prefix (cdr-safe cell))) (when (fboundp f) @@ -14012,7 +14012,7 @@ information." (org-show-entry) (org-with-limited-levels (case detail - ((tree canonical t) (show-children)) + ((tree canonical t) (outline-show-children)) ((nil minimal ancestors)) (t (save-excursion (outline-next-heading) @@ -14025,7 +14025,7 @@ information." (while (org-up-heading-safe) (org-flag-heading nil) (when (memq detail '(canonical t)) (org-show-entry)) - (when (memq detail '(tree canonical t)) (show-children))))))) + (when (memq detail '(tree canonical t)) (outline-show-children))))))) (defvar org-reveal-start-hook nil "Hook run before revealing a location.") @@ -19733,12 +19733,12 @@ boundaries." ;; Outline functions from `outline-mode-prefix-map' ;; that can be remapped in Org: (define-key org-mode-map [remap outline-mark-subtree] 'org-mark-subtree) -(define-key org-mode-map [remap show-subtree] 'org-show-subtree) +(define-key org-mode-map [remap outline-show-subtree] 'org-show-subtree) (define-key org-mode-map [remap outline-forward-same-level] 'org-forward-heading-same-level) (define-key org-mode-map [remap outline-backward-same-level] 'org-backward-heading-same-level) -(define-key org-mode-map [remap show-branches] +(define-key org-mode-map [remap outline-show-branches] 'org-kill-note-or-show-branches) (define-key org-mode-map [remap outline-promote] 'org-promote-subtree) (define-key org-mode-map [remap outline-demote] 'org-demote-subtree) @@ -19861,7 +19861,7 @@ boundaries." ;; All the other keys -(org-defkey org-mode-map "\C-c\C-a" 'show-all) ; in case allout messed up. +(org-defkey org-mode-map "\C-c\C-a" 'outline-show-all) ; in case allout messed up. (org-defkey org-mode-map "\C-c\C-r" 'org-reveal) (if (boundp 'narrow-map) (org-defkey narrow-map "s" 'org-narrow-to-subtree) @@ -20247,7 +20247,7 @@ The detailed reaction depends on the user option `org-catch-invisible-edits'." (if invisible-before-point (goto-char (previous-single-char-property-change (point) 'invisible))) - (show-subtree)) + (outline-show-subtree)) (cond ((eq org-catch-invisible-edits 'show) ;; That's it, we do the edit after showing @@ -21260,8 +21260,8 @@ Use \\[org-edit-special] to edit table.el tables")) (interactive) (if (not org-finish-function) (progn - (hide-subtree) - (call-interactively 'show-branches)) + (outline-hide-subtree) + (call-interactively 'outline-show-branches)) (let ((org-note-abort t)) (funcall org-finish-function)))) @@ -21737,7 +21737,7 @@ on context. See the individual commands for more information." ["Cycle Global Visibility" org-shifttab :active (not (org-at-table-p))] ["Sparse Tree..." org-sparse-tree t] ["Reveal Context" org-reveal t] - ["Show All" show-all t] + ["Show All" outline-show-all t] "--" ["Subtree to indirect buffer" org-tree-to-indirect-buffer t]) "--" @@ -24133,7 +24133,7 @@ interactive command with similar behavior." (or (looking-at org-outline-regexp) (re-search-forward org-outline-regexp-bol end t)) (while (and (< (point) end) (looking-at org-outline-regexp)) - (hide-subtree) + (outline-hide-subtree) (org-cycle-show-empty-lines 'folded) (condition-case nil (outline-forward-same-level 1) diff --git a/lisp/ox-org.el b/lisp/ox-org.el index b395577..5b93104 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -298,7 +298,7 @@ Return output file name." newbuf) (with-current-buffer work-buffer (font-lock-ensure) - (show-all) + (outline-show-all) (org-show-block-all) (setq newbuf (htmlize-buffer))) (with-current-buffer newbuf |