procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/outline.el: Don't set outline-minor font-lock text property 'keymap'.

Browse source 
Instead of adding font-lock text property 'keymap' with
outline-minor-mode-cycle on headings in outline-minor-mode,
check for outline-minor-mode-cycle and outline-on-heading-p
in :filter on keys from the keymap of outline-minor-mode.
https://lists.gnu.org/archive/html/emacs-devel/2022-01/msg00180.html

(outline-minor-mode-cycle--bind): Add a condition on outline-minor-mode-cycle
and outline-on-heading-p in :filter.
(outline-font-lock-keywords): Remove if-branches for outline-minor-mode-cycle
that added keymap.
(outline-minor-mode-highlight-buffer): Don't put keymap on overlays.
(outline-minor-mode): Rewrite :keymap setting to rely on
easy-mmode-define-keymap, and add :inherit outline-minor-mode-cycle-map.
Don't check for outline-minor-mode-cycle to add font-lock keywords.
(outline--insert-open-button, outline--insert-close-button):
Remove :parent outline-minor-mode-cycle-map.
This commit is contained in:
Juri Linkov 2022-01-10 20:20:09 +02:00
parent 415ed4b425
commit 2b7a486605
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lisp/outline.el
View file

@ -187,6 +187,7 @@ in the file it applies to.")
(function :tag "Custom filter"))
:version "28.1")
(defvar outline-minor-mode-cycle)
(defun outline-minor-mode-cycle--bind (map key binding &optional filter)
(define-key map key
`(menu-item
@ -195,8 +196,10 @@ in the file it applies to.")
:filter
,(or filter
(lambda (cmd)
(when (or (not (functionp outline-minor-mode-cycle-filter))
(funcall outline-minor-mode-cycle-filter))
(when (and outline-minor-mode-cycle
(outline-on-heading-p)
(or (not (functionp outline-minor-mode-cycle-filter))
(funcall outline-minor-mode-cycle-filter)))
cmd))))))
(defvar outline-minor-mode-cycle-map
@ -223,14 +226,8 @@ in the file it applies to.")
;; Highlight headings according to the level.
(eval . (list (concat "^\\(?:" outline-regexp "\\).*")
0 '(if outline-minor-mode
(if outline-minor-mode-cycle
(if outline-minor-mode-highlight
(list 'face (outline-font-lock-face)
'keymap outline-minor-mode-cycle-map)
(list 'face nil
'keymap outline-minor-mode-cycle-map))
(if outline-minor-mode-highlight
(list 'face (outline-font-lock-face))))
(if outline-minor-mode-highlight
(list 'face (outline-font-lock-face)))
(outline-font-lock-face))
(when outline-minor-mode
(pcase outline-minor-mode-highlight
@ -410,9 +407,7 @@ faces to major mode's faces."
(not (get-text-property (point) 'face))))
(overlay-put overlay 'face (outline-font-lock-face)))
(when outline-minor-mode-use-buttons
(outline--insert-open-button))
(when outline-minor-mode-cycle
(overlay-put overlay 'keymap outline-minor-mode-cycle-map)))
(outline--insert-open-button)))
(goto-char (match-end 0))))))
;;;###autoload
@ -421,11 +416,13 @@ faces to major mode's faces."
See the command `outline-mode' for more information on this mode."
:lighter " Outl"
:keymap (list (cons [menu-bar] outline-minor-mode-menu-bar-map)
(cons outline-minor-mode-prefix outline-mode-prefix-map))
:keymap (easy-mmode-define-keymap
`(([menu-bar] . ,outline-minor-mode-menu-bar-map)
(,outline-minor-mode-prefix . ,outline-mode-prefix-map))
:inherit outline-minor-mode-cycle-map)
(if outline-minor-mode
(progn
(when (or outline-minor-mode-cycle outline-minor-mode-highlight)
(when outline-minor-mode-highlight
(if (and global-font-lock-mode (font-lock-specified-p major-mode))
(progn
(font-lock-add-keywords nil outline-font-lock-keywords t)
@ -438,7 +435,7 @@ See the command `outline-mode' for more information on this mode."
(setq-local line-move-ignore-invisible t)
;; Cause use of ellipses for invisible text.
(add-to-invisibility-spec '(outline . t)))
(when (or outline-minor-mode-cycle outline-minor-mode-highlight)
(when outline-minor-mode-highlight
(if font-lock-fontified
(font-lock-remove-keywords nil outline-font-lock-keywords))
(remove-overlays nil nil 'outline-overlay t)
@ -992,7 +989,6 @@ If non-nil, EVENT should be a mouse event."
(overlay-put o 'help-echo "Click to hide")
(overlay-put o 'keymap
(define-keymap
:parent outline-minor-mode-cycle-map
"RET" #'outline-hide-subtree
"<mouse-2>" #'outline-hide-subtree)))))
@ -1003,7 +999,6 @@ If non-nil, EVENT should be a mouse event."
(overlay-put o 'help-echo "Click to show")
(overlay-put o 'keymap
(define-keymap
:parent outline-minor-mode-cycle-map
"RET" #'outline-show-subtree
"<mouse-2>" #'outline-show-subtree)))))