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

Fix 'whitespace-mode' with 'missing-newline-at-eof'

Browse source 
* lisp/whitespace.el (whitespace-post-command-hook): Refontify
when point moves if 'missing-newline-at-eof' is in
'whitespace-active-style'.  (Bug#73332)
This commit is contained in:
Eli Zaretskii 2024-09-21 13:41:21 +03:00
parent eced135120
commit 01ebe6de89
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/whitespace.el
View file

@ -2319,10 +2319,22 @@ Also refontify when necessary."
(font-lock-flush whitespace-eob-marker (1+ (buffer-size))))) (font-lock-flush whitespace-eob-marker (1+ (buffer-size)))))
(setq-local whitespace-buffer-changed nil) (setq-local whitespace-buffer-changed nil)
(setq whitespace-point (point)) ; current point position (setq whitespace-point (point)) ; current point position
(let ((refontify (and (eolp) ; It is at end of line ... (let ((refontify (or (and (eolp) ; It is at end of line ...
;; ... with trailing SPACE or TAB ;; ... with trailing SPACE or TAB
(or (memq (preceding-char) '(?\s ?\t))) (or (memq (preceding-char) '(?\s ?\t)))
(line-beginning-position))) (line-beginning-position))
(and (memq 'missing-newline-at-eof
;; If user requested to highlight
;; EOB without a newline...
whitespace-active-style)
;; ...and the buffer is not empty...
(not (= (point-min) (point-max)))
(= (point-max) (without-restriction (point-max)))
;; ...and no newline at EOB...
(not (eq (char-before (point-max)) ?\n))
;; ...then refontify the last character in
;; the buffer
(max (1- (point-max)) (point-min)))))
(ostart (overlay-start whitespace-point--used))) (ostart (overlay-start whitespace-point--used)))
(cond (cond
((not refontify) ((not refontify)