aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2025-06-07 12:21:38 +0300
committerEli Zaretskii2025-06-07 12:21:38 +0300
commitfc96cc1feb488dfeffd760d63872515f04033894 (patch)
tree971301aaa10f5704b3e95f499fc97cd57260ab28
parent9629ade0b0366d62202419f37b467fe0e6caf227 (diff)
downloademacs-fc96cc1feb488dfeffd760d63872515f04033894.tar.gz
emacs-fc96cc1feb488dfeffd760d63872515f04033894.zip
Avoid whitespace-mode breaking standard-display-unicode-special-glyphs
* lisp/whitespace.el (whitespace-display-char-on): Copy from 'standard-display-table' if 'buffer-display-table' is nil. This avoids overwriting display-table customizations by features that modify 'standard-display-table' for global effects. (Bug#78522)
-rw-r--r--lisp/whitespace.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 10425759562..58ba0db8c90 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2480,7 +2480,8 @@ purposes)."
2480 ;; Assure `buffer-display-table' is unique 2480 ;; Assure `buffer-display-table' is unique
2481 ;; when two or more windows are visible. 2481 ;; when two or more windows are visible.
2482 (setq buffer-display-table 2482 (setq buffer-display-table
2483 (copy-sequence buffer-display-table))) 2483 (copy-sequence (or buffer-display-table
2484 standard-display-table))))
2484 (unless buffer-display-table 2485 (unless buffer-display-table
2485 (setq buffer-display-table (make-display-table))) 2486 (setq buffer-display-table (make-display-table)))
2486 (dolist (entry whitespace-display-mappings) 2487 (dolist (entry whitespace-display-mappings)