[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el

[Chong Yidong]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.389 
emacs/lisp/progmodes/compile.el:1.390
*** emacs/lisp/progmodes/compile.el:1.389       Mon Nov  7 00:49:17 2005
--- emacs/lisp/progmodes/compile.el     Thu Nov 24 20:52:16 2005
***************
*** 1335,1353 ****
    ;; jit-lock might fontify some things too late.
    (set (make-local-variable 'font-lock-support-mode) nil)
    (set (make-local-variable 'font-lock-maximum-size) nil)
!   (let ((fld font-lock-defaults))
!     (if (and minor fld)
        (font-lock-add-keywords nil (compilation-mode-font-lock-keywords))
-       (setq font-lock-defaults '(compilation-mode-font-lock-keywords t)))
-     (if minor
        (if font-lock-mode
            (if fld
                (font-lock-fontify-buffer)
              (font-lock-change-mode)
              (turn-on-font-lock))
!         (turn-on-font-lock))
!       ;; maybe defer font-lock till after derived mode is set up
!       (run-mode-hooks 'compilation-turn-on-font-lock))))
  
  ;;;###autoload
  (define-minor-mode compilation-shell-minor-mode
--- 1335,1351 ----
    ;; jit-lock might fontify some things too late.
    (set (make-local-variable 'font-lock-support-mode) nil)
    (set (make-local-variable 'font-lock-maximum-size) nil)
!   (if minor
!       (let ((fld font-lock-defaults))
        (font-lock-add-keywords nil (compilation-mode-font-lock-keywords))
        (if font-lock-mode
            (if fld
                (font-lock-fontify-buffer)
              (font-lock-change-mode)
              (turn-on-font-lock))
!         (turn-on-font-lock)))
!     ;; maybe defer font-lock till after derived mode is set up
!     (run-mode-hooks 'compilation-turn-on-font-lock)))
  
  ;;;###autoload
  (define-minor-mode compilation-shell-minor-mode