aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-06-11 14:00:27 -0400
committerGlenn Morris2013-06-11 14:00:27 -0400
commit7de135d06fcc24d3ee946947251a8b969fb3fee0 (patch)
treea1d52a2a6d0120314322269ff2287dd7080630ec
parentfa6bc6fd5023120ba9ecfb34cf88a84e5b3ab2a4 (diff)
downloademacs-7de135d06fcc24d3ee946947251a8b969fb3fee0.tar.gz
emacs-7de135d06fcc24d3ee946947251a8b969fb3fee0.zip
lisp-mode font-lock fox for bug#14574
* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Prettify after setting font-lock-defaults.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/lisp-mode.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 872f6cd12e3..d08f8ddbcbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-06-11 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/lisp-mode.el (lisp-mode-variables):
4 Prettify after setting font-lock-defaults. (Bug#14574)
5
12013-06-11 Juanma Barranquero <lekktu@gmail.com> 62013-06-11 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * replace.el (query-replace, occur-read-regexp-defaults-function) 8 * 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."
223 (setq-local imenu-generic-expression lisp-imenu-generic-expression) 223 (setq-local imenu-generic-expression lisp-imenu-generic-expression)
224 (setq-local multibyte-syntax-as-symbol t) 224 (setq-local multibyte-syntax-as-symbol t)
225 (setq-local syntax-begin-function 'beginning-of-defun) 225 (setq-local syntax-begin-function 'beginning-of-defun)
226 (prog-prettify-install lisp--prettify-symbols-alist)
227 (setq font-lock-defaults 226 (setq font-lock-defaults
228 `((lisp-font-lock-keywords 227 `((lisp-font-lock-keywords
229 lisp-font-lock-keywords-1 228 lisp-font-lock-keywords-1
@@ -231,7 +230,8 @@ font-lock keywords will not be case sensitive."
231 nil ,keywords-case-insensitive nil nil 230 nil ,keywords-case-insensitive nil nil
232 (font-lock-mark-block-function . mark-defun) 231 (font-lock-mark-block-function . mark-defun)
233 (font-lock-syntactic-face-function 232 (font-lock-syntactic-face-function
234 . lisp-font-lock-syntactic-face-function)))) 233 . lisp-font-lock-syntactic-face-function)))
234 (prog-prettify-install lisp--prettify-symbols-alist))
235 235
236(defun lisp-outline-level () 236(defun lisp-outline-level ()
237 "Lisp mode `outline-level' function." 237 "Lisp mode `outline-level' function."