[Emacs-diffs] trunk r112927: lisp-mode font-lock fox for bug#14574

[Glenn Morris]

------------------------------------------------------------
revno: 112927
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-11 14:00:27 -0400
message:
  lisp-mode font-lock fox for bug#14574
  
  * lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables):
  Prettify after setting font-lock-defaults.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp-mode.el   lispmode.el-20091113204419-o5vbwnq5f7feedwu-205

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-11 16:51:12 +0000
+++ b/lisp/ChangeLog    2013-06-11 18:00:27 +0000
@@ -1,3 +1,8 @@
+2013-06-11  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/lisp-mode.el (lisp-mode-variables):
+       Prettify after setting font-lock-defaults.  (Bug#14574)
+
 2013-06-11  Juanma Barranquero  <address@hidden>
 
        * replace.el (query-replace, occur-read-regexp-defaults-function)

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2013-06-05 17:48:50 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2013-06-11 18:00:27 +0000
@@ -223,7 +223,6 @@
   (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 @@
          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."