1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
emacs/lisp/reveal.el

257 lines
11 KiB
EmacsLisp
Raw Normal View History

Misc fixes, and use lexical-binding in more files. * lisp/subr.el (letrec): New macro. (with-wrapper-hook): Move from lisp/simple.el and don't use CL. * simple.el (with-wrapper-hook): Move with-wrapper-hook to subr.el. * lisp/help-fns.el (help-function-arglist): Handle subroutines as well. (describe-variable): Use special-variable-p to filter completions. * lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Don't expand `declare' in defmacros. * lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Handle `declare'. * lisp/emacs-lisp/cl.el (pushnew): Silence unfixable warning. * lisp/emacs-lisp/cl-macs.el (defstruct, define-compiler-macro): Mark unused arg as unused. * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Use memq. * lisp/emacs-lisp/autoload.el (make-autoload): Don't assume the macro's first sexp is a list. (autoload-generate-file-autoloads): Improve error message. * lisp/emacs-lisp/advice.el (ad-arglist): Use help-function-arglist to understand the new byte-code arg format. * lisp/vc/smerge-mode.el: * lisp/vc/log-view.el: * lisp/vc/log-edit.el: * lisp/vc/cvs-status.el: * lisp/uniquify.el: * lisp/textmodes/css-mode.el: * lisp/textmodes/bibtex-style.el: * lisp/reveal.el: * lisp/newcomment.el: * lisp/emacs-lisp/smie.el: * lisp/abbrev.el: Use lexical-binding. * src/eval.c (Fprog1, Fprog2): Simplify and use XCDR/XCAR. (Fdefvar): Remove redundant SYMBOLP check. (Ffunctionp): Don't signal an error for undefined aliases. * doc/lispref/variables.texi (Converting to Lexical Binding): New node.
2011-03-11 20:04:22 +00:00
;;; reveal.el --- Automatically reveal hidden text at point -*- lexical-binding: t -*-
2001-11-28 07:12:25 +00:00
;; Copyright (C) 2000-2020 Free Software Foundation, Inc.
2001-11-28 07:12:25 +00:00
2006-04-30 15:49:08 +00:00
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
2001-11-28 07:12:25 +00:00
;; Keywords: outlines
2001-12-25 11:10:03 +00:00
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
2001-11-28 07:12:25 +00:00
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
2001-11-28 07:12:25 +00:00
2002-05-18 11:26:16 +00:00
;; GNU Emacs is distributed in the hope that it will be useful,
2001-11-28 07:12:25 +00:00
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
2001-11-28 07:12:25 +00:00
;;; Commentary:
;; Reveal mode is a minor mode that makes sure that text around point
;; is always visible. When point enters a region of hidden text,
;; `reveal-mode' temporarily makes it visible.
;;
;; Overlays can also use the `display' property. For them to be
;; revealed, the `reveal-toggle-invisible' property also has to be
;; present, and should be a function to toggle between having a
;; display property and not.
;;
2001-11-28 07:12:25 +00:00
;; This is normally used in conjunction with `outline-minor-mode',
;; `hs-minor-mode', `hide-ifdef-mode', ...
;;
;; It only works with packages that hide text using overlays.
;; Packages can provide special support for it by placing
;; a function in the `reveal-toggle-invisible' property on the symbol
;; used as the value of the `invisible' overlay property.
;; The function is called right after revealing (or re-hiding) the
;; text with two arguments: the overlay and a boolean that's non-nil
;; if we have just revealed the text. When revealing, that function
;; may re-hide some of the text.
;;; Todo:
;; - find other hysteresis features.
;; - don't hide after a scroll command
;; - delay hiding by a couple seconds (i.e. hide in the background)
2001-11-28 07:12:25 +00:00
;;; Code:
(defgroup reveal nil
"Reveal hidden text on the fly."
:group 'convenience)
2001-11-28 07:12:25 +00:00
(defcustom reveal-around-mark t
"Reveal text around the mark, if active."
:type 'boolean
:group 'reveal)
2001-11-28 07:12:25 +00:00
(defcustom reveal-auto-hide t
"Automatically hide revealed text when leaving it.
If nil, the `reveal-hide-revealed' command can be useful to hide
revealed text manually."
:type 'boolean
:version "28.1")
(defvar reveal-open-spots nil
"List of spots in the buffer which are open.
Each element has the form (WINDOW . OVERLAY).")
2001-11-28 07:12:25 +00:00
(make-variable-buffer-local 'reveal-open-spots)
(defvar reveal-last-tick nil)
(make-variable-buffer-local 'reveal-last-tick)
2001-11-28 07:12:25 +00:00
;; Actual code
(defun reveal-post-command ()
;; Refresh the spots that might have changed.
;; `Refreshing' here means to try and re-hide the corresponding text.
;; We don't refresh everything correctly:
;; - we only refresh spots in the current window.
;; FIXME: do we actually know that (current-buffer) = (window-buffer) ?
(with-local-quit
(with-demoted-errors "Reveal: %s"
(let ((old-ols
(delq nil
(mapcar
(lambda (x)
;; We refresh any spot in the current window as well
;; as any spots associated with a dead window or
;; a window which does not show this buffer any more.
(cond
((eq (car x) (selected-window)) (cdr x))
((not (and (window-live-p (car x))
(eq (window-buffer (car x))
(current-buffer))))
;; Adopt this since it's owned by a window that's
;; either not live or at least not showing this
;; buffer any more.
(setcar x (selected-window))
(cdr x))))
reveal-open-spots))))
(setq old-ols (reveal-open-new-overlays old-ols))
(when reveal-auto-hide
(reveal-close-old-overlays old-ols))))))
(defun reveal-open-new-overlays (old-ols)
(let ((repeat t))
(while repeat
(setq repeat nil)
(dolist (ol (nconc (when (and reveal-around-mark mark-active)
(overlays-at (mark)))
(overlays-at (point))))
(setq old-ols (delq ol old-ols))
(when (overlay-start ol) ;Check it's still live.
;; We either have an invisible overlay, or a display
;; overlay. Always reveal invisible text, but only reveal
;; display properties if `reveal-toggle-invisible' is
;; present.
(let ((inv (overlay-get ol 'invisible))
(disp (and (overlay-get ol 'display)
(overlay-get ol 'reveal-toggle-invisible)))
open)
(when (and (or (and inv
;; There's an `invisible' property.
;; Make sure it's actually invisible,
;; and ellipsized.
(and (consp buffer-invisibility-spec)
(cdr (assq inv buffer-invisibility-spec))))
disp)
(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)))))
(when inv
(overlay-put ol 'reveal-invisible inv))
(push (cons (selected-window) ol) reveal-open-spots)
(if (null open)
(overlay-put ol 'invisible nil)
;; Use the provided opening function and repeat (since the
;; opening function might have hidden a subpart around point
;; or moved/killed some of the overlays).
(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)
(overlay-put ol 'invisible nil))))))))))
old-ols)
(defun reveal-close-old-overlays (old-ols)
(if (or track-mouse ;Don't close in the middle of a click.
(not (eq reveal-last-tick
(setq reveal-last-tick (buffer-modified-tick)))))
;; The buffer was modified since last command: let's refrain from
;; closing any overlay because it tends to behave poorly when
;; inserting text at the end of an overlay (basically the overlay
;; should be rear-advance when it's open, but things like
;; outline-minor-mode make it non-rear-advance because it's
;; a better choice when it's closed).
nil
;; The last command was only a point motion or some such
;; non-buffer-modifying command. Let's close whatever can be closed.
(dolist (ol old-ols)
(if (and (overlay-start ol) ;Check it's still live.
(>= (point) (save-excursion
(goto-char (overlay-start ol))
(line-beginning-position 1)))
(<= (point) (save-excursion
(goto-char (overlay-end ol))
(line-beginning-position 2)))
;; If the application has moved the overlay to some other
;; buffer, we'd better reset the buffer to its
;; original state.
(eq (current-buffer) (overlay-buffer ol)))
;; Still near the overlay: keep it open.
nil
;; Really close it.
(let* ((inv (overlay-get ol 'reveal-invisible))
(open (or (overlay-get ol 'reveal-toggle-invisible)
(get inv 'reveal-toggle-invisible)
(overlay-get ol 'isearch-open-invisible-temporary))))
(if (and (overlay-start ol) ;Check it's still live.
open)
(condition-case err
(funcall open ol t)
(error (message "!!Reveal-hide (funcall %s %s t): %s !!"
open ol err)))
(overlay-put ol 'invisible inv))
;; Remove the overlay from the list of open spots.
(overlay-put ol 'reveal-invisible nil)
(setq reveal-open-spots
(delq (rassoc ol reveal-open-spots)
reveal-open-spots)))))))
2001-11-28 07:12:25 +00:00
(defun reveal-hide-revealed ()
"Hide all revealed text.
If there is revealed text under point, this command does not hide
that text."
(interactive)
(let ((reveal-auto-hide t))
(reveal-post-command)))
(defvar reveal-mode-map
(let ((map (make-sparse-keymap)))
;; Override the default move-beginning-of-line and move-end-of-line
;; which skips valuable invisible text.
(define-key map [remap move-beginning-of-line] 'beginning-of-line)
(define-key map [remap move-end-of-line] 'end-of-line)
map))
2001-11-28 07:12:25 +00:00
;;;###autoload
(define-minor-mode reveal-mode
2011-12-05 08:55:25 +00:00
"Toggle uncloaking of invisible text near point (Reveal mode).
2001-11-28 07:12:25 +00:00
2011-12-05 08:55:25 +00:00
Reveal mode is a buffer-local minor mode. When enabled, it
reveals invisible text around point.
Also see the `reveal-auto-hide' variable."
2005-04-04 09:05:09 +00:00
:group 'reveal
:lighter (global-reveal-mode nil " Reveal")
:keymap reveal-mode-map
2001-11-28 07:12:25 +00:00
(if reveal-mode
(progn
(set (make-local-variable 'search-invisible) t)
(add-hook 'post-command-hook 'reveal-post-command nil t))
(kill-local-variable 'search-invisible)
(remove-hook 'post-command-hook 'reveal-post-command t)))
;;;###autoload
(define-minor-mode global-reveal-mode
Fix minor mode docstrings for the new meaning of a nil ARG. * abbrev.el (abbrev-mode): * allout.el (allout-mode): * autoinsert.el (auto-insert-mode): * autoarg.el (autoarg-mode, autoarg-kp-mode): * autorevert.el (auto-revert-mode, auto-revert-tail-mode) (global-auto-revert-mode): * battery.el (display-battery-mode): * composite.el (global-auto-composition-mode) (auto-composition-mode): * delsel.el (delete-selection-mode): * desktop.el (desktop-save-mode): * dired-x.el (dired-omit-mode): * dirtrack.el (dirtrack-mode): * doc-view.el (doc-view-minor-mode): * double.el (double-mode): * electric.el (electric-indent-mode, electric-pair-mode): * emacs-lock.el (emacs-lock-mode): * epa-hook.el (auto-encryption-mode): * follow.el (follow-mode): * font-core.el (font-lock-mode): * frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode): * help.el (temp-buffer-resize-mode): * hilit-chg.el (highlight-changes-mode) (highlight-changes-visible-mode): * hi-lock.el (hi-lock-mode): * hl-line.el (hl-line-mode, global-hl-line-mode): * icomplete.el (icomplete-mode): * ido.el (ido-everywhere): * image-file.el (auto-image-file-mode): * image-mode.el (image-minor-mode): * iswitchb.el (iswitchb-mode): * jka-cmpr-hook.el (auto-compression-mode): * linum.el (linum-mode): * longlines.el (longlines-mode): * master.el (master-mode): * mb-depth.el (minibuffer-depth-indicate-mode): * menu-bar.el (menu-bar-mode): * minibuf-eldef.el (minibuffer-electric-default-mode): * mouse-sel.el (mouse-sel-mode): * msb.el (msb-mode): * mwheel.el (mouse-wheel-mode): * outline.el (outline-minor-mode): * paren.el (show-paren-mode): * recentf.el (recentf-mode): * reveal.el (reveal-mode, global-reveal-mode): * rfn-eshadow.el (file-name-shadow-mode): * ruler-mode.el (ruler-mode): * savehist.el (savehist-mode): * scroll-all.el (scroll-all-mode): * scroll-bar.el (scroll-bar-mode): * server.el (server-mode): * shell.el (shell-dirtrack-mode): * simple.el (auto-fill-mode, transient-mark-mode) (visual-line-mode, overwrite-mode, binary-overwrite-mode) (line-number-mode, column-number-mode, size-indication-mode) (auto-save-mode, normal-erase-is-backspace-mode, visible-mode): * strokes.el (strokes-mode): * time.el (display-time-mode): * t-mouse.el (gpm-mouse-mode): * tool-bar.el (tool-bar-mode): * tooltip.el (tooltip-mode): * type-break.el (type-break-mode-line-message-mode) (type-break-query-mode): * view.el (view-mode): * whitespace.el (whitespace-mode, whitespace-newline-mode) (global-whitespace-mode, global-whitespace-newline-mode): * xt-mouse.el (xterm-mouse-mode): Doc fix. * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix autogenerated docstring.
2011-10-19 12:54:24 +00:00
"Toggle Reveal mode in all buffers (Global Reveal mode).
Reveal mode renders invisible text around point visible again."
2002-11-18 04:07:47 +00:00
:global t :group 'reveal
2001-11-28 07:12:25 +00:00
(setq-default reveal-mode global-reveal-mode)
(if global-reveal-mode
(progn
(setq search-invisible t)
(add-hook 'post-command-hook 'reveal-post-command))
(setq search-invisible 'open) ;FIXME
(remove-hook 'post-command-hook 'reveal-post-command)))
(provide 'reveal)
2002-11-18 04:07:47 +00:00
2001-11-28 07:12:25 +00:00
;;; reveal.el ends here