[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 093234f: Revert overlay-related changes in `C-h b'
From: |
Lars Ingebrigtsen |
Subject: |
master 093234f: Revert overlay-related changes in `C-h b' |
Date: |
Tue, 2 Nov 2021 12:34:55 -0400 (EDT) |
branch: master
commit 093234f8457cf15c9d08e959079b35ad90ab31a0
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Revert overlay-related changes in `C-h b'
* lisp/help.el (describe-bindings): Revert overlay-related changes
-- these are already output (normally) by `describe-buffer-bindings'.
---
lisp/help.el | 61 ++++++++++++++++++++++++------------------------------------
1 file changed, 24 insertions(+), 37 deletions(-)
diff --git a/lisp/help.el b/lisp/help.el
index 9f7e1a9..f6041c2 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -580,43 +580,30 @@ to display (default, the current buffer). BUFFER can be
a buffer
or a buffer name."
(interactive)
(or buffer (setq buffer (current-buffer)))
- (let ((overlays (overlays-at (point))))
- (help-setup-xref (list #'describe-bindings prefix buffer)
- (called-interactively-p 'interactive))
- (with-help-window (help-buffer)
- (with-current-buffer (help-buffer)
- ;; Output keymaps from overlays, if any. (Keymaps from text
- ;; properties is handled by `describe-buffer-bindings'.)
- (dolist (o overlays)
- (when-let ((map (overlay-get o 'local-map)))
- (insert "Overriding Overlay Bindings:\n")
- (describe-map map)
- (insert "\n"))
- (when-let ((map (overlay-get o 'keymap)))
- (insert "Overlay Bindings:\n")
- (describe-map map)
- (insert "\n")))
-
- (describe-buffer-bindings buffer prefix)
-
- (when describe-bindings-outline
- (setq-local outline-regexp ".*:$")
- (setq-local outline-heading-end-regexp ":\n")
- (setq-local outline-level (lambda () 1))
- (setq-local outline-minor-mode-cycle t
- outline-minor-mode-highlight t)
- (setq-local outline-minor-mode-use-buttons t)
- (outline-minor-mode 1)
- (save-excursion
- (goto-char (point-min))
- (let ((inhibit-read-only t))
- ;; Hide the longest body.
- (when (re-search-forward "Key translations" nil t)
- (outline-hide-subtree))
- ;; Hide ^Ls.
- (while (search-forward "\n\f\n" nil t)
- (put-text-property (1+ (match-beginning 0)) (1- (match-end 0))
- 'invisible t)))))))))
+ (help-setup-xref (list #'describe-bindings prefix buffer)
+ (called-interactively-p 'interactive))
+ (with-help-window (help-buffer)
+ (with-current-buffer (help-buffer)
+ (describe-buffer-bindings buffer prefix)
+
+ (when describe-bindings-outline
+ (setq-local outline-regexp ".*:$")
+ (setq-local outline-heading-end-regexp ":\n")
+ (setq-local outline-level (lambda () 1))
+ (setq-local outline-minor-mode-cycle t
+ outline-minor-mode-highlight t)
+ (setq-local outline-minor-mode-use-buttons t)
+ (outline-minor-mode 1)
+ (save-excursion
+ (goto-char (point-min))
+ (let ((inhibit-read-only t))
+ ;; Hide the longest body.
+ (when (re-search-forward "Key translations" nil t)
+ (outline-hide-subtree))
+ ;; Hide ^Ls.
+ (while (search-forward "\n\f\n" nil t)
+ (put-text-property (1+ (match-beginning 0)) (1- (match-end 0))
+ 'invisible t))))))))
(defun where-is (definition &optional insert)
"Print message listing key sequences that invoke the command DEFINITION.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 093234f: Revert overlay-related changes in `C-h b',
Lars Ingebrigtsen <=