aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-04-28 21:09:25 -0400
committerGlenn Morris2015-04-28 21:09:25 -0400
commit438b6b1a5254753425520ed9c984e00704ae401c (patch)
treed1d01e9d6f80e8fc7879fe166e6edd0294589c6c
parent853941383f8d1e1d0b182e3784b2bc72aca55460 (diff)
downloademacs-438b6b1a5254753425520ed9c984e00704ae401c.tar.gz
emacs-438b6b1a5254753425520ed9c984e00704ae401c.zip
* lisp/foldout.el: Update for 2015-01-30 outline.el changes.
(foldout-zoom-subtree, foldout-exit-fold, foldout-mouse-show) (foldout-mouse-hide-or-exit): Use new names for outline functions.
-rw-r--r--lisp/foldout.el24
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 443f8b72217..64c0af451b8 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -280,16 +280,16 @@ optional arg EXPOSURE \(interactively with prefix arg\) changes this:-
280 (goto-char start) 280 (goto-char start)
281 (cond 281 (cond
282 ((null exposure) 282 ((null exposure)
283 (show-entry) 283 (outline-show-entry)
284 (show-children)) 284 (outline-show-children))
285 ((< exposure-value 0) 285 ((< exposure-value 0)
286 (show-entry)) 286 (outline-show-entry))
287 ((consp exposure) 287 ((consp exposure)
288 (show-children)) 288 (outline-show-children))
289 ((> exposure-value 0) 289 ((> exposure-value 0)
290 (show-children exposure-value)) 290 (outline-show-children exposure-value))
291 (t 291 (t
292 (show-subtree)) 292 (outline-show-subtree))
293 ) 293 )
294 294
295 ;; save the location of the fold we are entering 295 ;; save the location of the fold we are entering
@@ -366,7 +366,7 @@ exited and text is left visible."
366 ;; hide the subtree 366 ;; hide the subtree
367 (when hide-fold 367 (when hide-fold
368 (goto-char start-marker) 368 (goto-char start-marker)
369 (hide-subtree)) 369 (outline-hide-subtree))
370 370
371 ;; make sure the next heading is exposed 371 ;; make sure the next heading is exposed
372 (if end-marker 372 (if end-marker
@@ -454,10 +454,10 @@ What gets exposed depends on the number of mouse clicks:-
454 (foldout-mouse-goto-heading event) 454 (foldout-mouse-goto-heading event)
455 (let ((nclicks (event-click-count event))) 455 (let ((nclicks (event-click-count event)))
456 (cond 456 (cond
457 ((= nclicks 1) (show-entry)) 457 ((= nclicks 1) (outline-show-entry))
458 ((= nclicks 2) (show-children)) 458 ((= nclicks 2) (outline-show-children))
459 ((= nclicks 3) (show-entry) (show-children)) 459 ((= nclicks 3) (outline-show-entry) (outline-show-children))
460 (t (show-subtree))))) 460 (t (outline-show-subtree)))))
461 461
462(defun foldout-mouse-hide-or-exit (event) 462(defun foldout-mouse-hide-or-exit (event)
463 "Hide the subtree under the heading clicked on, or exit a fold. 463 "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:-
478 (if (= nclicks 1) 478 (if (= nclicks 1)
479 (progn 479 (progn
480 (foldout-mouse-goto-heading event) 480 (foldout-mouse-goto-heading event)
481 (hide-subtree)) 481 (outline-hide-subtree))
482 (foldout-exit-fold 482 (foldout-exit-fold
483 (cond 483 (cond
484 ((= nclicks 2) 1) ; exit and hide 484 ((= nclicks 2) 1) ; exit and hide