procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce and use prog-prettify-install.

Browse source
This commit is contained in:
Ted Zlatanov 2013-06-05 13:48:50 -04:00
parent f019a68484
commit 8fc57765e8
5 changed files with 33 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/emacs-lisp/lisp-mode.el
View file

@ -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