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

Fix 744ed0ceee from bug#57082 (bug#57176)

Browse source 
* lisp/outline.el (outline-minor-mode-highlight-buffer): Handle 'append'.
(outline-minor-mode): Call outline--fix-up-all-buttons when font-lock is used.

* lisp/textmodes/emacs-news-mode.el (emacs-news--mode-common): Fix regexp.
This commit is contained in:
Juri Linkov 2022-08-30 20:09:20 +03:00
parent e1e60e51bf
commit 7804536e4e
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/outline.el
View file

@ -427,15 +427,14 @@ outline font-lock faces to those of major mode."
(goto-char (point-min))
(let ((regexp (concat "^\\(?:" outline-regexp "\\).*$")))
(while (re-search-forward regexp nil t)
(let ((overlay (make-overlay (match-beginning 0)
(match-end 0))))
(let ((overlay (make-overlay (match-beginning 0) (match-end 0))))
(overlay-put overlay 'outline-overlay t)
(when (or (eq outline-minor-mode-highlight 'override)
;; FIXME: Is it possible to override all underlying face attributes?
(when (or (memq outline-minor-mode-highlight '(append override))
(and (eq outline-minor-mode-highlight t)
(goto-char (match-beginning 0))
(not (get-text-property (point) 'face))))
(not (get-text-property (match-beginning 0) 'face))))
(overlay-put overlay 'face (outline-font-lock-face)))
(when (and (outline--use-buttons-p) (outline-on-heading-p))
(when (outline--use-buttons-p)
(outline--insert-open-button)))
(goto-char (match-end 0))))))
@ -452,10 +451,12 @@ See the command `outline-mode' for more information on this mode."
(if outline-minor-mode
(progn
(when outline-minor-mode-highlight
(when (and global-font-lock-mode (font-lock-specified-p major-mode))
(font-lock-add-keywords nil outline-font-lock-keywords t)
(font-lock-flush))
(outline-minor-mode-highlight-buffer))
(if (and global-font-lock-mode (font-lock-specified-p major-mode))
(progn
(font-lock-add-keywords nil outline-font-lock-keywords t)
(font-lock-flush)
(outline--fix-up-all-buttons))
(outline-minor-mode-highlight-buffer)))
;; Turn off this mode if we change major modes.
(add-hook 'change-major-mode-hook
(lambda () (outline-minor-mode -1))

6
lisp/textmodes/emacs-news-mode.el
View file

@ -73,9 +73,11 @@
(defun emacs-news--mode-common ()
(setq-local font-lock-defaults '(emacs-news-mode-font-lock-keywords t))
(setq-local outline-regexp "\\(:? +\\)?\\(\\*+\\) "
;; This `outline-regexp' matches leading spaces inserted
;; by the current implementation of `outline-minor-mode-use-buttons'.
(setq-local outline-regexp "\\(?: +\\)?\\(\\*+\\) "
outline-level (lambda () (length (match-string 1)))
outline-minor-mode-cycle t
outline-level (lambda () (length (match-string 2)))
outline-minor-mode-highlight 'append)
(outline-minor-mode)
(emacs-etc--hide-local-variables))