From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 7 Jun 2025 09:21:38 +0000 (+0300)
Subject: Avoid whitespace-mode breaking standard-display-unicode-special-glyphs
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbbecfd8acbde379fa32c71488c9b857e4e8ed11;p=emacs.git

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)

(cherry picked from commit fc96cc1feb488dfeffd760d63872515f04033894)
---

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)."
 	;; Assure `buffer-display-table' is unique
 	;; when two or more windows are visible.
 	(setq buffer-display-table
-	      (copy-sequence buffer-display-table)))
+	      (copy-sequence (or buffer-display-table
+                                 standard-display-table))))
       (unless buffer-display-table
 	(setq buffer-display-table (make-display-table)))
       (dolist (entry whitespace-display-mappings)