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

[Michael Kifer]

Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.40 emacs/lisp/ediff-mult.el:1.41
*** emacs/lisp/ediff-mult.el:1.40       Mon Jul  4 23:08:53 2005
--- emacs/lisp/ediff-mult.el    Sun Jul 10 18:46:24 2005
***************
*** 205,210 ****
--- 205,216 ----
  This can be toggled with `ediff-toggle-filename-truncation'."
    :type 'boolean
    :group 'ediff-mult)
+ 
+ (defcustom ediff-meta-mode-hook nil
+   "*Hooks run just after setting up meta mode."
+   :type 'hook
+   :group 'ediff-mult)
+ 
  (defcustom ediff-registry-setup-hook nil
    "*Hooks run just after the registry control panel is set up."
    :type 'hook
***************
*** 411,417 ****
    (kill-all-local-variables)
    (setq major-mode 'ediff-meta-mode)
    (setq mode-name "MetaEdiff")
!   (run-mode-hooks 'ediff-meta-mode-hook))
  
  
  ;; the keymap for the buffer showing directory differences
--- 417,424 ----
    (kill-all-local-variables)
    (setq major-mode 'ediff-meta-mode)
    (setq mode-name "MetaEdiff")
!   ;; don't use run-mode-hooks here!
!   (run-hooks 'ediff-meta-mode-hook))
  
  
  ;; the keymap for the buffer showing directory differences