[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/reveal.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/reveal.el |
Date: |
Sun, 27 Feb 2005 18:42:16 -0500 |
Index: emacs/lisp/reveal.el
diff -c emacs/lisp/reveal.el:1.13 emacs/lisp/reveal.el:1.14
*** emacs/lisp/reveal.el:1.13 Mon Nov 22 20:52:10 2004
--- emacs/lisp/reveal.el Sun Feb 27 23:42:14 2005
***************
*** 1,6 ****
;;; reveal.el --- Automatically reveal hidden text at point
! ;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: outlines
--- 1,6 ----
;;; reveal.el --- Automatically reveal hidden text at point
! ;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: outlines
***************
*** 93,108 ****
(overlays-at (point))))
(push (cons (selected-window) ol) reveal-open-spots)
(setq old-ols (delq ol old-ols))
! (let ((open (overlay-get ol 'reveal-toggle-invisible)) inv)
! (when (or open
! (and (setq inv (overlay-get ol 'invisible))
! (symbolp inv)
! (or (setq open (or (get inv 'reveal-toggle-invisible)
! (overlay-get ol
'isearch-open-invisible-temporary)))
! (overlay-get ol 'isearch-open-invisible)
! (and (consp buffer-invisibility-spec)
! (assq inv buffer-invisibility-spec)))
! (overlay-put ol 'reveal-invisible inv)))
(if (null open)
(overlay-put ol 'invisible nil)
;; Use the provided opening function and repeat (since the
--- 93,114 ----
(overlays-at (point))))
(push (cons (selected-window) ol) reveal-open-spots)
(setq old-ols (delq ol old-ols))
! (let ((inv (overlay-get ol 'invisible)) open)
! (when (and inv
! ;; There's an `invisible' property. Make sure it's
! ;; actually invisible.
! (or (not (listp buffer-invisibility-spec))
! (memq inv buffer-invisibility-spec)
! (assq inv buffer-invisibility-spec))
! (or (setq open
! (or (overlay-get ol 'reveal-toggle-invisible)
! (and (symbolp inv)
! (get inv 'reveal-toggle-invisible))
! (overlay-get ol
'isearch-open-invisible-temporary)))
! (overlay-get ol 'isearch-open-invisible)
! (and (consp buffer-invisibility-spec)
! (cdr (assq inv buffer-invisibility-spec))))
! (overlay-put ol 'reveal-invisible inv))
(if (null open)
(overlay-put ol 'invisible nil)
;; Use the provided opening function and repeat (since the
***************
*** 110,116 ****
(setq repeat t)
(condition-case err
(funcall open ol nil)
! (error (message "!!Reveal-show: %s !!" err)
;; Let's default to a meaningful behavior to avoid
;; getting stuck in an infinite loop.
(setq repeat nil)
--- 116,123 ----
(setq repeat t)
(condition-case err
(funcall open ol nil)
! (error (message "!!Reveal-show (funcall %s %s nil): %s !!"
! open ol err)
;; Let's default to a meaningful behavior to avoid
;; getting stuck in an infinite loop.
(setq repeat nil)
***************
*** 147,153 ****
(overlay-get ol
'isearch-open-invisible-temporary)))))
(condition-case err
(funcall open ol t)
! (error (message "!!Reveal-hide: %s !!" err)))
(overlay-put ol 'invisible inv))))))))
(error (message "Reveal: %s" err)))))
--- 154,161 ----
(overlay-get ol
'isearch-open-invisible-temporary)))))
(condition-case err
(funcall open ol t)
! (error (message "!!Reveal-hide (funcall %s %s t): %s !!"
! open ol err)))
(overlay-put ol 'invisible inv))))))))
(error (message "Reveal: %s" err)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/reveal.el,
Stefan Monnier <=