[Emacs-diffs] Changes to emacs/lisp/hi-lock.el

[Chong Yidong]

Index: emacs/lisp/hi-lock.el
diff -c emacs/lisp/hi-lock.el:1.27 emacs/lisp/hi-lock.el:1.28
*** emacs/lisp/hi-lock.el:1.27  Sun Sep 18 12:25:02 2005
--- emacs/lisp/hi-lock.el       Sat Nov 12 17:17:52 2005
***************
*** 304,311 ****
      (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)))
        (unless font-lock-mode
        (font-lock-mode 1))
        (define-key-after menu-bar-edit-menu [hi-lock]
--- 304,313 ----
      (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)
!       (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,327 ****
--- 324,333 ----
              (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))))