[Emacs-diffs] scratch/outline 18467f2 11/15: lisp/outline.el (outline-show-subtree): Rename from `show-subtree'.

[Oleh Krehel]

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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38d2b63..d4e0720 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-28  Oleh Krehel  <address@hidden>
 
+       * outline.el (outline-show-subtree): Rename from `show-subtree'.
+       (show-subtree): Declare as obsolete.
+
+2015-01-28  Oleh Krehel  <address@hidden>
+
        * outline.el (outline-hide-leaves): Rename from `hide-leaves'.
        (hide-leaves): Declare as obsolete.
 
diff --git a/lisp/outline.el b/lisp/outline.el
index f97c2d6..248eeb9 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -63,7 +63,7 @@ in the file it applies to.")
     (define-key map "\C-n" 'outline-next-visible-heading)
     (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-s" 'outline-show-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)
@@ -105,8 +105,8 @@ in the file it applies to.")
       '(menu-item "Hide Leaves" outline-hide-leaves
         :help "Hide the body after this heading and at deeper levels"))
     (define-key map [show] (cons "Show" (make-sparse-keymap "Show")))
-    (define-key map [show show-subtree]
-      '(menu-item "Show Subtree" show-subtree
+    (define-key map [show outline-show-subtree]
+      '(menu-item "Show Subtree" outline-show-subtree
         :help "Show everything after this heading at deeper levels"))
     (define-key map [show show-children]
       '(menu-item "Show Children" show-children
@@ -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 `outline-hide-subtree', `show-subtree', `show-children',
+The commands `outline-hide-subtree', `outline-show-subtree', `show-children',
 `outline-hide-entry', `outline-show-entry', `outline-hide-leaves', and 
`show-branches'
 are used when point is on a heading line.
 
@@ -837,11 +837,14 @@ Show the heading too, if it is currently invisible."
 (define-obsolete-function-alias
     'hide-leaves 'outline-hide-leaves "25.1")
 
-(defun show-subtree ()
+(defun outline-show-subtree ()
   "Show everything after this heading at deeper levels."
   (interactive)
   (outline-flag-subtree nil))
 
+(define-obsolete-function-alias
+    'show-subtree 'outline-show-subtree "25.1")
+
 (defun outline-show-heading ()
   "Show the current heading and move to its end."
   (outline-flag-region (- (point)