X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7e09ef09a479731d01b1ca46e94ddadd73ac98e3..96bd07a3226700156fa7d5ec20e9bd6550c95057:/lisp/foldout.el

diff --git a/lisp/foldout.el b/lisp/foldout.el
index 443f8b7221..dd01636d02 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -1,6 +1,6 @@
 ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode
 
-;; Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
 ;; Maintainer: emacs-devel@gnu.org
@@ -250,7 +250,7 @@ An end marker of nil means the fold ends after (point-max).")
   "Open the subtree under the current heading and narrow to it.
 
 Normally the body and the immediate subheadings are exposed, but
-optional arg EXPOSURE \(interactively with prefix arg\) changes this:-
+optional arg EXPOSURE \(interactively with prefix arg) changes this:-
 
 	EXPOSURE > 0	exposes n levels of subheadings (c.f. show-children)
 	EXPOSURE < 0	exposes only the body
@@ -280,16 +280,16 @@ optional arg EXPOSURE \(interactively with prefix arg\) changes this:-
       (goto-char start)
       (cond
        ((null exposure)
-	(show-entry)
-	(show-children))
+	(outline-show-entry)
+	(outline-show-children))
        ((< exposure-value 0)
-	(show-entry))
+	(outline-show-entry))
        ((consp exposure)
-	(show-children))
+	(outline-show-children))
        ((> exposure-value 0)
-	(show-children exposure-value))
+	(outline-show-children exposure-value))
        (t
-	(show-subtree))
+	(outline-show-subtree))
        )
 
       ;; save the location of the fold we are entering
@@ -366,7 +366,7 @@ exited and text is left visible."
 	;; hide the subtree
 	(when hide-fold
 	  (goto-char start-marker)
-	  (hide-subtree))
+	  (outline-hide-subtree))
 
 	;; make sure the next heading is exposed
 	(if end-marker
@@ -454,10 +454,10 @@ What gets exposed depends on the number of mouse clicks:-
   (foldout-mouse-goto-heading event)
   (let ((nclicks (event-click-count event)))
     (cond
-     ((= nclicks 1) (show-entry))
-     ((= nclicks 2) (show-children))
-     ((= nclicks 3) (show-entry) (show-children))
-     (t (show-subtree)))))
+     ((= nclicks 1) (outline-show-entry))
+     ((= nclicks 2) (outline-show-children))
+     ((= nclicks 3) (outline-show-entry) (outline-show-children))
+     (t (outline-show-subtree)))))
 
 (defun foldout-mouse-hide-or-exit (event)
   "Hide the subtree under the heading clicked on, or exit a fold.
@@ -478,7 +478,7 @@ What happens depends on the number of mouse clicks:-
     (if (= nclicks 1)
 	(progn
 	  (foldout-mouse-goto-heading event)
-	  (hide-subtree))
+	  (outline-hide-subtree))
       (foldout-exit-fold
        (cond
 	((= nclicks 2) 1)		; exit and hide