[Emacs-diffs] scratch/outline ada4428 08/15: lisp/outline.el (outline-show-all): Rename from `show-all'.

[Oleh Krehel]

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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 523df94..a42195d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-28  Oleh Krehel  <address@hidden>
 
+       * outline.el (outline-show-all): Rename from `show-all'.
+       (show-all): Declare as obsolete.
+
+2015-01-28  Oleh Krehel  <address@hidden>
+
        * outline.el (outline-hide-region-body): Rename from
        `hide-region-body'.
        (hide-region-body): Declare as obsolete.
diff --git a/lisp/outline.el b/lisp/outline.el
index 8105eb1..f51e3e7 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -69,7 +69,7 @@ in the file it applies to.")
     (define-key map "\C-f" 'outline-forward-same-level)
     (define-key map "\C-b" 'outline-backward-same-level)
     (define-key map "\C-t" 'outline-hide-body)
-    (define-key map "\C-a" 'show-all)
+    (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)
@@ -117,8 +117,8 @@ in the file it applies to.")
     (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
+    (define-key map [show outline-show-all]
+      '(menu-item "Show All" outline-show-all
         :help "Show all of the text in the buffer"))
     (define-key map [headings]
       (cons "Headings" (make-sparse-keymap "Headings")))
@@ -285,7 +285,7 @@ Turning on outline mode calls the value of `text-mode-hook' 
and then of
        '(outline-font-lock-keywords t nil nil backward-paragraph))
   (setq imenu-generic-expression
         (list (list nil (concat "^\\(?:" outline-regexp "\\).*$") 0)))
-  (add-hook 'change-major-mode-hook 'show-all nil t))
+  (add-hook 'change-major-mode-hook 'outline-show-all nil t))
 
 (defcustom outline-minor-mode-prefix "\C-c@"
   "Prefix key to use for Outline commands in Outline minor mode.
@@ -318,7 +318,7 @@ See the command `outline-mode' for more information on this 
mode."
     ;; Cause use of ellipses for invisible text.
     (remove-from-invisibility-spec '(outline . t))
     ;; When turning off outline mode, get rid of any outline hiding.
-    (show-all)))
+    (outline-show-all)))
 
 (defvar outline-level 'outline-level
   "Function of no args to compute a header's nesting level in an outline.
@@ -807,11 +807,14 @@ Show the heading too, if it is currently invisible."
 (define-obsolete-function-alias
     'hide-region-body 'outline-hide-region-body "25.1")
 
-(defun show-all ()
+(defun outline-show-all ()
   "Show all of the text in the buffer."
   (interactive)
   (outline-flag-region (point-min) (point-max) nil))
 
+(define-obsolete-function-alias
+    'show-all 'outline-show-all "25.1")
+
 (defun hide-subtree ()
   "Hide everything after this heading at deeper levels."
   (interactive)