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 872f6cd12e369793ecd90528997c48ad697067c1..d08f8ddbcbd4272fe945a419ed04f6571f39e319 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-11  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/lisp-mode.el (lisp-mode-variables):
+       Prettify after setting font-lock-defaults.  (Bug#14574)
+
 2013-06-11  Juanma Barranquero  <lekktu@gmail.com>
 
        * 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 4267b9f45b9051567e0a269b395f4098e1b7a043..cbd8854e7d6f3193b3f055b0ef411fb855cbcd46 100644 (file)
--- 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."