[Emacs-diffs] scratch/outline ef1267e 13/15: lisp/outline.el (outline-hide-other): Rename from `hide-other'.

[Oleh Krehel]

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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 710e353..eb6b19c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-28  Oleh Krehel  <address@hidden>
 
+       * outline.el (outline-hide-other): Rename from `hide-other'.
+       (hide-other): Declare as obsolete.
+
+2015-01-28  Oleh Krehel  <address@hidden>
+
        * outline.el (outline-hide-sublevels): Rename from
        `hide-sublevels'.
        (hide-sublevels): Declare as obsolete.
diff --git a/lisp/outline.el b/lisp/outline.el
index 4685245..5061a8e 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -75,7 +75,7 @@ in the file it applies to.")
     (define-key map "\C-l" 'outline-hide-leaves)
     (define-key map "\C-k" 'show-branches)
     (define-key map "\C-q" 'outline-hide-sublevels)
-    (define-key map "\C-o" 'hide-other)
+    (define-key map "\C-o" 'outline-hide-other)
     (define-key map "\C-^" 'outline-move-subtree-up)
     (define-key map "\C-v" 'outline-move-subtree-down)
     (define-key map [(control ?<)] 'outline-promote)
@@ -86,8 +86,8 @@ in the file it applies to.")
 (defvar outline-mode-menu-bar-map
   (let ((map (make-sparse-keymap)))
     (define-key map [hide] (cons "Hide" (make-sparse-keymap "Hide")))
-    (define-key map [hide hide-other]
-      '(menu-item "Hide Other" hide-other
+    (define-key map [hide outline-hide-other]
+      '(menu-item "Hide Other" outline-hide-other
         :help "Hide everything except current body and parent and top-level 
headings"))
     (define-key map [hide outline-hide-sublevels]
       '(menu-item "Hide Sublevels" outline-hide-sublevels
@@ -896,7 +896,7 @@ Show the heading too, if it is currently invisible."
 (define-obsolete-function-alias
     'hide-sublevels 'outline-hide-sublevels "25.1")
 
-(defun hide-other ()
+(defun outline-hide-other ()
   "Hide everything except current body and parent and top-level headings."
   (interactive)
   (outline-hide-sublevels 1)
@@ -905,12 +905,15 @@ Show the heading too, if it is currently invisible."
       (outline-back-to-heading t)
       (outline-show-entry)
       (while (condition-case nil (progn (outline-up-heading 1 t) (not (bobp)))
-              (error nil))
-       (outline-flag-region (1- (point))
-                            (save-excursion (forward-line 1) (point))
-                            nil))))
+               (error nil))
+        (outline-flag-region (1- (point))
+                             (save-excursion (forward-line 1) (point))
+                             nil))))
   (run-hooks 'outline-view-change-hook))
 
+(define-obsolete-function-alias
+    'hide-other 'outline-hide-other "25.1")
+
 (defun outline-toggle-children ()
   "Show or hide the current subtree depending on its current state."
   (interactive)