[Emacs-diffs] scratch/outline f898942 10/15: lisp/outline.el (outline-hide-leaves): Rename from `hide-leaves'.

[Oleh Krehel]

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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32f7235..38d2b63 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-28  Oleh Krehel  <address@hidden>
 
+       * outline.el (outline-hide-leaves): Rename from `hide-leaves'.
+       (hide-leaves): Declare as obsolete.
+
+2015-01-28  Oleh Krehel  <address@hidden>
+
        * outline.el (outline-hide-subtree): Rename from `hide-subtree'.
        (hide-subtree): Declare as obsolete.
 
diff --git a/lisp/outline.el b/lisp/outline.el
index 8f2c1a3..f97c2d6 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -72,7 +72,7 @@ in the file it applies to.")
     (define-key map "\C-a" 'outline-show-all)
     (define-key map "\C-c" 'outline-hide-entry)
     (define-key map "\C-e" 'outline-show-entry)
-    (define-key map "\C-l" 'hide-leaves)
+    (define-key map "\C-l" 'outline-hide-leaves)
     (define-key map "\C-k" 'show-branches)
     (define-key map "\C-q" 'hide-sublevels)
     (define-key map "\C-o" 'hide-other)
@@ -101,8 +101,8 @@ in the file it applies to.")
     (define-key map [hide outline-hide-body]
       '(menu-item "Hide Body" outline-hide-body
         :help "Hide all body lines in buffer, leaving all headings visible"))
-    (define-key map [hide hide-leaves]
-      '(menu-item "Hide Leaves" hide-leaves
+    (define-key map [hide outline-hide-leaves]
+      '(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]
@@ -262,7 +262,7 @@ 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',
-`outline-hide-entry', `outline-show-entry', `hide-leaves', and `show-branches'
+`outline-hide-entry', `outline-show-entry', `outline-hide-leaves', and 
`show-branches'
 are used when point is on a heading line.
 
 The variable `outline-regexp' can be changed to control what is a heading.
@@ -823,14 +823,19 @@ Show the heading too, if it is currently invisible."
 (define-obsolete-function-alias
     'hide-subtree 'outline-hide-subtree "25.1")
 
-(defun hide-leaves ()
+(defun outline-hide-leaves ()
   "Hide the body after this heading and at deeper levels."
   (interactive)
   (save-excursion
     (outline-back-to-heading)
-;; Turned off to fix bug reported by Otto Maddox on 22 Nov 2005.
-;;    (outline-end-of-heading)
-    (outline-hide-region-body (point) (progn (outline-end-of-subtree) 
(point)))))
+    ;; Turned off to fix bug reported by Otto Maddox on 22 Nov 2005.
+    ;;    (outline-end-of-heading)
+    (outline-hide-region-body
+     (point)
+     (progn (outline-end-of-subtree) (point)))))
+
+(define-obsolete-function-alias
+    'hide-leaves 'outline-hide-leaves "25.1")
 
 (defun show-subtree ()
   "Show everything after this heading at deeper levels."