From: Glenn Morris Date: Tue, 11 Jun 2013 18:00:27 +0000 (-0400) Subject: lisp-mode font-lock fox for bug#14574 X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7de135d06fcc24d3ee946947251a8b969fb3fee0;p=emacs.git lisp-mode font-lock fox for bug#14574 * lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Prettify after setting font-lock-defaults. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 872f6cd12e3..d08f8ddbcbd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-06-11 Glenn Morris + + * emacs-lisp/lisp-mode.el (lisp-mode-variables): + Prettify after setting font-lock-defaults. (Bug#14574) + 2013-06-11 Juanma Barranquero * replace.el (query-replace, occur-read-regexp-defaults-function) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 4267b9f45b9..cbd8854e7d6 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -223,7 +223,6 @@ 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) - (prog-prettify-install lisp--prettify-symbols-alist) (setq font-lock-defaults `((lisp-font-lock-keywords lisp-font-lock-keywords-1 @@ -231,7 +230,8 @@ font-lock keywords will not be case sensitive." nil ,keywords-case-insensitive nil nil (font-lock-mark-block-function . mark-defun) (font-lock-syntactic-face-function - . lisp-font-lock-syntactic-face-function)))) + . lisp-font-lock-syntactic-face-function))) + (prog-prettify-install lisp--prettify-symbols-alist)) (defun lisp-outline-level () "Lisp mode `outline-level' function."