[Emacs-diffs] scratch/outline 7ecd5ee 05/15: lisp/outline.el (outline-show-entry): rename from `show-entry'

[Oleh Krehel]

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

    lisp/outline.el (outline-show-entry): rename from `show-entry'
---
 lisp/ChangeLog  |    5 +++++
 lisp/outline.el |   25 ++++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88617b5..c531368 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-28  Oleh Krehel  <address@hidden>
 
+       * outline.el (outline-show-entry): Rename from `show-entry'.
+       (show-entry): Declare as obsolete.
+
+2015-01-28  Oleh Krehel  <address@hidden>
+
        * outline.el (outline-hide-entry): Rename from `hide-entry'.
        (hide-entry): Declare as obsolete.
 
diff --git a/lisp/outline.el b/lisp/outline.el
index 1f97aa7..8f3c5d9 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -71,7 +71,7 @@ in the file it applies to.")
     (define-key map "\C-t" 'hide-body)
     (define-key map "\C-a" 'show-all)
     (define-key map "\C-c" 'outline-hide-entry)
-    (define-key map "\C-e" 'show-entry)
+    (define-key map "\C-e" 'outline-show-entry)
     (define-key map "\C-l" 'hide-leaves)
     (define-key map "\C-k" 'show-branches)
     (define-key map "\C-q" 'hide-sublevels)
@@ -114,8 +114,8 @@ in the file it applies to.")
     (define-key map [show show-branches]
       '(menu-item "Show Branches" show-branches
         :help "Show all subheadings of this heading, but not their bodies"))
-    (define-key map [show show-entry]
-      '(menu-item "Show Entry" show-entry
+    (define-key map [show outline-show-entry]
+      '(menu-item "Show Entry" outline-show-entry
         :help "Show the body directly following this heading"))
     (define-key map [show show-all]
       '(menu-item "Show All" show-all
@@ -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',
-`outline-hide-entry', `show-entry', `hide-leaves', and `show-branches'
+`outline-hide-entry', `outline-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.
@@ -684,7 +684,7 @@ This puts point at the start of the current subtree, and 
mark at the end."
 (defvar outline-isearch-open-invisible-function nil
   "Function called if `isearch' finishes in an invisible overlay.
 The function is called with the overlay as its only argument.
-If nil, `show-entry' is called to reveal the invisible text.")
+If nil, `outline-show-entry' is called to reveal the invisible text.")
 
 (put 'outline 'reveal-toggle-invisible 'outline-reveal-toggle-invisible)
 (defun outline-flag-region (from to flag)
@@ -731,7 +731,7 @@ If FLAG is nil then text is shown, while if FLAG is t the 
text is hidden."
       (let ((o1 (copy-overlay o)))
        (overlay-put o 'invisible nil)  ;Show (most of) the text.
        (while (progn
-                (show-entry)
+                (outline-show-entry)
                 (show-children)
                 ;; Normally just the above is needed.
                 ;; But in odd cases, the above might fail to show anything.
@@ -750,7 +750,7 @@ If FLAG is nil then text is shown, while if FLAG is t the 
text is hidden."
 ;; `outline-flag-region').
 (defun outline-isearch-open-invisible (_overlay)
   ;; We rely on the fact that isearch places point on the matched text.
-  (show-entry))
+  (outline-show-entry))
 
 (defun outline-hide-entry ()
   "Hide the body directly following this heading."
@@ -763,14 +763,17 @@ If FLAG is nil then text is shown, while if FLAG is t the 
text is hidden."
 (define-obsolete-function-alias
     'hide-entry 'outline-hide-entry "25.1")
 
-(defun show-entry ()
+(defun outline-show-entry ()
   "Show the body directly following this heading.
 Show the heading too, if it is currently invisible."
   (interactive)
   (save-excursion
     (outline-back-to-heading t)
     (outline-flag-region (1- (point))
-                        (progn (outline-next-preface) (point)) nil)))
+                         (progn (outline-next-preface) (point)) nil)))
+
+(define-obsolete-function-alias
+    'show-entry 'outline-show-entry "25.1")
 
 (defun hide-body ()
   "Hide all body lines in buffer, leaving all headings visible."
@@ -877,7 +880,7 @@ Show the heading too, if it is currently invisible."
   (let (outline-view-change-hook)
     (save-excursion
       (outline-back-to-heading t)
-      (show-entry)
+      (outline-show-entry)
       (while (condition-case nil (progn (outline-up-heading 1 t) (not (bobp)))
               (error nil))
        (outline-flag-region (1- (point))
@@ -893,7 +896,7 @@ Show the heading too, if it is currently invisible."
     (if (not (outline-invisible-p (line-end-position)))
        (hide-subtree)
       (show-children)
-      (show-entry))))
+      (outline-show-entry))))
 
 (defun outline-flag-subtree (flag)
   (save-excursion