Mercurial > emacs
changeset 66833:efab878cd2e1
* hi-lock.el (hi-lock-mode): Set the default value of
font-lock-defaults.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 12 Nov 2005 17:17:52 +0000 |
| parents | b744ba78737f |
| children | 871ff6d80553 |
| files | lisp/ChangeLog lisp/hi-lock.el |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Nov 12 14:45:08 2005 +0000 +++ b/lisp/ChangeLog Sat Nov 12 17:17:52 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-12 Chong Yidong <cyd@stupidchicken.com> + + * hi-lock.el (hi-lock-mode): Set the default value of + font-lock-defaults. + 2005-11-11 Luc Teirlinck <teirllm@auburn.edu> * find-lisp.el (find-lisp-find-dired-insert-file): Pass `string'
--- a/lisp/hi-lock.el Sat Nov 12 14:45:08 2005 +0000 +++ b/lisp/hi-lock.el Sat Nov 12 17:17:52 2005 +0000 @@ -304,8 +304,10 @@ (when (and (not hi-lock-mode-prev) hi-lock-mode) (add-hook 'find-file-hook 'hi-lock-find-file-hook) (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook) - (when (eq nil font-lock-defaults) - (setq font-lock-defaults '(nil))) + (if (null (default-value 'font-lock-defaults)) + (setq-default font-lock-defaults '(nil))) + (if (null font-lock-defaults) + (setq font-lock-defaults '(nil))) (unless font-lock-mode (font-lock-mode 1)) (define-key-after menu-bar-edit-menu [hi-lock] @@ -322,6 +324,10 @@ (setq hi-lock-interactive-patterns nil hi-lock-file-patterns nil) (when font-lock-mode (hi-lock-refontify))))) + + (let ((fld (default-value 'font-lock-defaults))) + (if (and fld (listp fld) (null (car fld))) + (setq-default font-lock-defaults (cdr fld)))) (define-key-after menu-bar-edit-menu [hi-lock] nil) (remove-hook 'find-file-hook 'hi-lock-find-file-hook) (remove-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook))))