diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2013-06-05 13:48:50 -0400 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2013-06-05 13:48:50 -0400 |
| commit | 8fc57765e8baaf917734997b6bd3ca014613ad65 (patch) | |
| tree | f42994d76b8818bbaff5da265510caf5cae46151 /lisp/emacs-lisp | |
| parent | f019a684847950c24f5dd8ee8cfdd40d3511ba83 (diff) | |
| download | emacs-8fc57765e8baaf917734997b6bd3ca014613ad65.tar.gz emacs-8fc57765e8baaf917734997b6bd3ca014613ad65.tar.bz2 emacs-8fc57765e8baaf917734997b6bd3ca014613ad65.zip | |
Introduce and use prog-prettify-install.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 6e1f8291771..4267b9f45b9 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -187,11 +187,6 @@ It has `lisp-mode-abbrev-table' as its parent." font-lock-string-face)))) font-lock-comment-face)) -;; Temporary variables used to add font-lock keywords dynamically. -(defvar lisp--augmented-font-lock-keywords) -(defvar lisp--augmented-font-lock-keywords-1) -(defvar lisp--augmented-font-lock-keywords-2) - (defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive) "Common initialization routine for lisp modes. The LISP-SYNTAX argument is used by code in inf-lisp.el and is @@ -228,20 +223,11 @@ font-lock keywords will not be case sensitive." (setq-local imenu-generic-expression lisp-imenu-generic-expression) (setq-local multibyte-syntax-as-symbol t) (setq-local syntax-begin-function 'beginning-of-defun) - (setq-local prog-prettify-symbols-alist lisp--prettify-symbols-alist) - (setq lisp--augmented-font-lock-keywords - (append lisp-font-lock-keywords - (prog-prettify-font-lock-symbols-keywords))) - (setq lisp--augmented-font-lock-keywords-1 - (append lisp-font-lock-keywords-1 - (prog-prettify-font-lock-symbols-keywords))) - (setq lisp--augmented-font-lock-keywords-2 - (append lisp-font-lock-keywords-2 - (prog-prettify-font-lock-symbols-keywords))) + (prog-prettify-install lisp--prettify-symbols-alist) (setq font-lock-defaults - `((lisp--augmented-font-lock-keywords - lisp--augmented-font-lock-keywords-1 - lisp--augmented-font-lock-keywords-2) + `((lisp-font-lock-keywords + lisp-font-lock-keywords-1 + lisp-font-lock-keywords-2) nil ,keywords-case-insensitive nil nil (font-lock-mark-block-function . mark-defun) (font-lock-syntactic-face-function |