[Emacs-diffs] scratch/outline 89d218c 04/15: * outline.el (outline-hide-entry): Rename from `hide-entry'.

[Oleh Krehel]

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

    * outline.el (outline-hide-entry): Rename from `hide-entry'.
    
    outline.el (hide-entry): Declare as obsolete.
---
 lisp/ChangeLog  |    5 +++++
 lisp/outline.el |   13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 159f925..88617b5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-28  Oleh Krehel  <address@hidden>
 
+       * outline.el (outline-hide-entry): Rename from `hide-entry'.
+       (hide-entry): Declare as obsolete.
+
+2015-01-28  Oleh Krehel  <address@hidden>
+
        * outline.el (outline-mode): Clean up docstring.
        (font-lock-warning-face): Remove obsolete declaration.
        (outline-font-lock-face): Remove obsolete comment.
diff --git a/lisp/outline.el b/lisp/outline.el
index 684a1dc..1f97aa7 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -70,7 +70,7 @@ in the file it applies to.")
     (define-key map "\C-b" 'outline-backward-same-level)
     (define-key map "\C-t" 'hide-body)
     (define-key map "\C-a" 'show-all)
-    (define-key map "\C-c" 'hide-entry)
+    (define-key map "\C-c" 'outline-hide-entry)
     (define-key map "\C-e" 'show-entry)
     (define-key map "\C-l" 'hide-leaves)
     (define-key map "\C-k" 'show-branches)
@@ -95,8 +95,8 @@ in the file it applies to.")
     (define-key map [hide hide-subtree]
       '(menu-item "Hide Subtree" hide-subtree
         :help "Hide everything after this heading at deeper levels"))
-    (define-key map [hide hide-entry]
-      '(menu-item "Hide Entry" hide-entry
+    (define-key map [hide outline-hide-entry]
+      '(menu-item "Hide Entry" outline-hide-entry
         :help "Hide the body directly following this heading"))
     (define-key map [hide hide-body]
       '(menu-item "Hide Body" hide-body
@@ -262,7 +262,7 @@ back.  A heading with text hidden under it is marked with 
an ellipsis (...).
 
 \\{outline-mode-map}
 The commands `hide-subtree', `show-subtree', `show-children',
-`hide-entry', `show-entry', `hide-leaves', and `show-branches'
+`outline-hide-entry', `show-entry', `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.
@@ -752,7 +752,7 @@ If FLAG is nil then text is shown, while if FLAG is t the 
text is hidden."
   ;; We rely on the fact that isearch places point on the matched text.
   (show-entry))
 
-(defun hide-entry ()
+(defun outline-hide-entry ()
   "Hide the body directly following this heading."
   (interactive)
   (save-excursion
@@ -760,6 +760,9 @@ If FLAG is nil then text is shown, while if FLAG is t the 
text is hidden."
     (outline-end-of-heading)
     (outline-flag-region (point) (progn (outline-next-preface) (point)) t)))
 
+(define-obsolete-function-alias
+    'hide-entry 'outline-hide-entry "25.1")
+
 (defun show-entry ()
   "Show the body directly following this heading.
 Show the heading too, if it is currently invisible."