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

* lisp/hi-lock.el: More fixes for revert-buffer (bug#57534)

Browse source 
(hi-lock-set-pattern): Put the text property 'regexp' on the lighter string.
(hi-lock-revert-buffer-rehighlight): Get the real regexp from the
text property 'regexp'.  This fixes the case when the original
regexp gets lost after e.g. 'M-s . M-s h r'.
This commit is contained in:
Juri Linkov 2024-06-27 21:08:28 +03:00
parent 280c91782a
commit 6d94090cad
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/hi-lock.el
View file

@ -780,7 +780,10 @@ SPACES-REGEXP is a regexp to substitute spaces in font-lock search."
(assoc (or lighter regexp) hi-lock-interactive-lighters))
(add-to-list 'hi-lock--unused-faces (face-name face))
(push pattern hi-lock-interactive-patterns)
(push (cons (or lighter regexp) pattern) hi-lock-interactive-lighters)
(push (cons (or (and lighter (propertize lighter 'regexp regexp))
regexp)
pattern)
hi-lock-interactive-lighters)
(if (and font-lock-mode (font-lock-specified-p major-mode)
(not hi-lock-use-overlays))
(progn
@ -888,7 +891,9 @@ Apply the previous patterns after reverting the buffer."
(setq hi-lock--unused-faces hi-lock-face-defaults)
(dolist (pattern (reverse patterns))
(let ((face (hi-lock-keyword->face (cdr pattern))))
(highlight-regexp (car pattern) face)
(highlight-regexp (or (get-text-property 0 'regexp (car pattern))
(car pattern))
face)
(setq hi-lock--unused-faces
(remove (face-name face) hi-lock--unused-faces)))))))))