diff options
| author | Richard M. Stallman | 2004-12-08 21:31:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-12-08 21:31:32 +0000 |
| commit | c14a736ec05d474c39104dc9e6a0ea2278a635fe (patch) | |
| tree | e20d161d5a118c24403ea2a1bf6da23401196e08 | |
| parent | 89281a95cf93a432ebaf6a40f306949b3a7f1e98 (diff) | |
| download | emacs-c14a736ec05d474c39104dc9e6a0ea2278a635fe.tar.gz emacs-c14a736ec05d474c39104dc9e6a0ea2278a635fe.zip | |
Delete code to set display table.
(escape-glyph): Redefine to be less loud. (Copy minibuffer-prompt.)
| -rw-r--r-- | lisp/faces.el | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index cf59931c881..9370440145a 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -2021,32 +2021,11 @@ Note: Other faces cannot inherit from the cursor face." | |||
| 2021 | :group 'font-lock ; like `show-trailing-whitespace' | 2021 | :group 'font-lock ; like `show-trailing-whitespace' |
| 2022 | :group 'basic-faces) | 2022 | :group 'basic-faces) |
| 2023 | 2023 | ||
| 2024 | 2024 | (defface escape-glyph '((((background dark)) :foreground "cyan") | |
| 2025 | ;; Make escape characters stand out in display | 2025 | (((type pc)) :foreground "magenta") |
| 2026 | 2026 | (t :foreground "dark blue")) | |
| 2027 | (defface escape-glyph | 2027 | "Face for displaying \\ and ^ in multichar glyphs." |
| 2028 | '((t :inherit secondary-selection)) | ||
| 2029 | "Basic face for displaying \\ and ^ in multichar glyphs. | ||
| 2030 | It is also used for ... in ellipses." | ||
| 2031 | :group 'basic-faces) | 2028 | :group 'basic-faces) |
| 2032 | |||
| 2033 | (put 'display-table 'char-table-extra-slots 6) | ||
| 2034 | |||
| 2035 | (or standard-display-table | ||
| 2036 | ;; avoid using autoloaded make-display-table here | ||
| 2037 | (setq standard-display-table (make-char-table 'display-table nil))) | ||
| 2038 | |||
| 2039 | (let* ((face (lsh (face-id 'escape-glyph) 19)) | ||
| 2040 | (backslash (+ face ?\\)) | ||
| 2041 | (dot (+ face ?.))) | ||
| 2042 | (set-char-table-extra-slot standard-display-table 2 backslash) | ||
| 2043 | (aset standard-display-table 2208 (vector backslash ?\s)) | ||
| 2044 | (aset standard-display-table 2221 (vector backslash ?-)) | ||
| 2045 | (set-char-table-extra-slot standard-display-table 3 (+ face ?^)) | ||
| 2046 | (set-char-table-extra-slot standard-display-table 4 (vector dot dot dot))) | ||
| 2047 | |||
| 2048 | |||
| 2049 | |||
| 2050 | 2029 | ||
| 2051 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 2030 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 2052 | ;;; Manipulating font names. | 2031 | ;;; Manipulating font names. |