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

Separate values 'override' and 'append' in 'outline-minor-mode-highlight'

Browse source 
* lisp/outline.el (outline-font-lock-keywords): Handle 'override' and 'append'
separately.
(outline-minor-mode-highlight): Separate values 'override' and 'append'.
(outline-minor-mode-highlight-buffer): Go to match-beginning
before checking '(point)'.
This commit is contained in:
Juri Linkov 2021-03-13 23:33:14 +02:00
parent 34b49ee8e9
commit fbfc3bd317
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/outline.el
View file

@ -207,9 +207,10 @@ in the file it applies to.")
(list 'face nil
'keymap outline-mode-cycle-map)))
(outline-font-lock-face))
(when (and outline-minor-mode
(eq outline-minor-mode-highlight 'override))
'append)
(when outline-minor-mode
(pcase outline-minor-mode-highlight
('override t)
('append 'append)))
t)))
"Additional expressions to highlight in Outline mode.")
@ -340,10 +341,12 @@ Typing these keys anywhere outside heading lines uses their default bindings."
Non-nil value works well only when outline font-lock keywords
don't conflict with the major mode's font-lock keywords.
When t, it puts outline faces only if there are no major mode's faces
on headings. When `override', it tries to append outline faces
to major mode's faces."
on headings. When `override', it completely overwrites major mode's
faces with outline faces. When `append', it tries to append outline
faces to major mode's faces."
:type '(choice (const :tag "No highlighting" nil)
(const :tag "Append to major mode faces" override)
(const :tag "Overwrite major mode faces" override)
(const :tag "Append outline faces to major mode faces" append)
(const :tag "Highlight separately from major mode faces" t))
:version "28.1")
;;;###autoload(put 'outline-minor-mode-highlight 'safe-local-variable 'booleanp)
@ -359,6 +362,7 @@ to major mode's faces."
(overlay-put overlay 'outline-overlay t)
(when (or (eq outline-minor-mode-highlight 'override)
(and (eq outline-minor-mode-highlight t)
(goto-char (match-beginning 0))
(not (get-text-property (point) 'face))))
(overlay-put overlay 'face (outline-font-lock-face)))
(when outline-minor-mode-cycle