[Emacs-diffs] Changes to emacs/lisp/ediff-util.el

[Michael Kifer]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.57 emacs/lisp/ediff-util.el:1.58
*** emacs/lisp/ediff-util.el:1.57       Mon Jul  4 23:08:53 2005
--- emacs/lisp/ediff-util.el    Sun Jul 10 18:46:24 2005
***************
*** 117,123 ****
    (kill-all-local-variables)
    (setq major-mode 'ediff-mode)
    (setq mode-name "Ediff")
!   (run-mode-hooks 'ediff-mode-hook))
  
  
  
--- 117,129 ----
    (kill-all-local-variables)
    (setq major-mode 'ediff-mode)
    (setq mode-name "Ediff")
!   ;; We use run-hooks instead of run-mode-hooks for two reasons.
!   ;; The ediff control buffer is read-only and it is not supposed to be
!   ;; modified by minor modes and such. So, run-mode-hooks doesn't do anything
!   ;; useful here on top of what run-hooks does.
!   ;; Second, changing run-hooks to run-mode-hooks would require an
!   ;; if-statement, since XEmacs doesn't have this. 
!   (run-hooks 'ediff-mode-hook))
  
  
  
***************
*** 3788,3796 ****
                      type ediff-current-diff-overlay-alist))
            (buffer (ediff-get-buffer type))
            (face (face-name
!                  (symbol-value
!                   (ediff-get-symbol-from-alist
!                    type ediff-current-diff-face-alist)))))
        (set overlay
             (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer))
        (ediff-set-overlay-face (symbol-value overlay) face)
--- 3794,3801 ----
                      type ediff-current-diff-overlay-alist))
            (buffer (ediff-get-buffer type))
            (face (face-name
!                  (ediff-get-symbol-from-alist
!                   type ediff-current-diff-face-alist))))
        (set overlay
             (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer))
        (ediff-set-overlay-face (symbol-value overlay) face)