[Emacs-diffs] scratch/outline a88ca2b 09/15: lisp/outline.el (outline-hide-subtree): Rename from `hide-subtree'.

[Oleh Krehel]

branch: scratch/outline
commit a88ca2b796c82c69e4345fcaf1849b869fbf96e7
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    lisp/outline.el (outline-hide-subtree): Rename from `hide-subtree'.
---
 lisp/ChangeLog  |    5 +++++
 lisp/outline.el |   19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a42195d..32f7235 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-28  Oleh Krehel  <address@hidden>
 
+       * outline.el (outline-hide-subtree): Rename from `hide-subtree'.
+       (hide-subtree): Declare as obsolete.
+
+2015-01-28  Oleh Krehel  <address@hidden>
+
        * outline.el (outline-show-all): Rename from `show-all'.
        (show-all): Declare as obsolete.
 
diff --git a/lisp/outline.el b/lisp/outline.el
index f51e3e7..8f2c1a3 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -64,7 +64,7 @@ in the file it applies to.")
     (define-key map "\C-p" 'outline-previous-visible-heading)
     (define-key map "\C-i" 'show-children)
     (define-key map "\C-s" 'show-subtree)
-    (define-key map "\C-d" 'hide-subtree)
+    (define-key map "\C-d" 'outline-hide-subtree)
     (define-key map "\C-u" 'outline-up-heading)
     (define-key map "\C-f" 'outline-forward-same-level)
     (define-key map "\C-b" 'outline-backward-same-level)
@@ -92,8 +92,8 @@ in the file it applies to.")
     (define-key map [hide hide-sublevels]
       '(menu-item "Hide Sublevels" hide-sublevels
         :help "Hide everything but the top LEVELS levels of headers, in whole 
buffer"))
-    (define-key map [hide hide-subtree]
-      '(menu-item "Hide Subtree" hide-subtree
+    (define-key map [hide outline-hide-subtree]
+      '(menu-item "Hide Subtree" outline-hide-subtree
         :help "Hide everything after this heading at deeper levels"))
     (define-key map [hide outline-hide-entry]
       '(menu-item "Hide Entry" outline-hide-entry
@@ -261,7 +261,7 @@ of the heading, so they move with it, if the line is killed 
and yanked
 back.  A heading with text hidden under it is marked with an ellipsis (...).
 
 \\{outline-mode-map}
-The commands `hide-subtree', `show-subtree', `show-children',
+The commands `outline-hide-subtree', `show-subtree', `show-children',
 `outline-hide-entry', `outline-show-entry', `hide-leaves', and `show-branches'
 are used when point is on a heading line.
 
@@ -622,7 +622,7 @@ the match data is set appropriately."
     (move-marker ins-point (point))
     (insert (delete-and-extract-region beg end))
     (goto-char ins-point)
-    (if folded (hide-subtree))
+    (if folded (outline-hide-subtree))
     (move-marker ins-point nil)))
 
 (defun outline-end-of-heading ()
@@ -721,7 +721,7 @@ If FLAG is nil then text is shown, while if FLAG is t the 
text is hidden."
          (let ((end (overlay-end o)))
            (delete-overlay o)
            (while (progn
-                    (hide-subtree)
+                    (outline-hide-subtree)
                     (outline-next-visible-heading 1)
                     (and (not (eobp)) (< (point) end))))))
 
@@ -815,11 +815,14 @@ Show the heading too, if it is currently invisible."
 (define-obsolete-function-alias
     'show-all 'outline-show-all "25.1")
 
-(defun hide-subtree ()
+(defun outline-hide-subtree ()
   "Hide everything after this heading at deeper levels."
   (interactive)
   (outline-flag-subtree t))
 
+(define-obsolete-function-alias
+    'hide-subtree 'outline-hide-subtree "25.1")
+
 (defun hide-leaves ()
   "Hide the body after this heading and at deeper levels."
   (interactive)
@@ -903,7 +906,7 @@ Show the heading too, if it is currently invisible."
   (save-excursion
     (outline-back-to-heading)
     (if (not (outline-invisible-p (line-end-position)))
-       (hide-subtree)
+       (outline-hide-subtree)
       (show-children)
       (outline-show-entry))))