--- whitespace-a.el 2017-05-14 14:12:59.000000000 +1200 +++ whitespace-b.el 2017-05-15 01:11:30.000000000 +1200 @@ -2496,9 +2496,10 @@ (let (vecs vec) ;; Remember whether a buffer has a local display table. (unless whitespace-display-table-was-local - (setq whitespace-display-table-was-local t - whitespace-display-table - (copy-sequence buffer-display-table)) + (setq whitespace-display-table-was-local t) + (unless (or whitespace-mode global-whitespace-mode) + (setq whitespace-display-table + (copy-sequence buffer-display-table))) ;; Assure `buffer-display-table' is unique ;; when two or more windows are visible. (setq buffer-display-table