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

[Michael Kifer]

Index: emacs/lisp/ediff-hook.el
diff -c emacs/lisp/ediff-hook.el:1.19 emacs/lisp/ediff-hook.el:1.20
*** emacs/lisp/ediff-hook.el:1.19       Thu Jan 31 23:16:02 2002
--- emacs/lisp/ediff-hook.el    Fri Apr 26 01:17:53 2002
***************
*** 44,84 ****
  ;; end pacifier
  
  ;; allow menus to be set up without ediff-wind.el being loaded
  (defvar ediff-window-setup-function)
  
! ;; This is used to avoid compilation warnings. When emacs/xemacs forms can
! ;; generate compile time warnings, we use this macro.
! ;; In this case, the macro will expand into the form that is appropriate to 
the
! ;; compiler at hand.
! ;; Suggested by rms.
  (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
    (if (string-match "XEmacs" emacs-version)
        xemacs-form emacs-form))
   
! ;; Note we wrap this in a progn so that we pick up the whole def
! ;; for auto-autoload. That way we do not load ediff-hook.el when defining
! ;; the menus.
! (progn
!   (ediff-cond-compile-for-xemacs-or-emacs
!    ;; xemacs form
!    (defun ediff-xemacs-init-menus ()
!      (if (featurep 'menubar)
!        (progn
!          (add-submenu
!           '("Tools") ediff-menu "OO-Browser...")
!          (add-submenu
!           '("Tools") ediff-merge-menu "OO-Browser...")
!          (add-submenu
!           '("Tools") epatch-menu "OO-Browser...")
!          (add-submenu
!           '("Tools") ediff-misc-menu "OO-Browser...")
!          (add-menu-button
!           '("Tools") "-------" "OO-Browser...")
!          )))
!    nil ; emacs form
!    ))
  
  
  (ediff-cond-compile-for-xemacs-or-emacs
   (progn
     (defvar ediff-menu
--- 44,88 ----
  ;; end pacifier
  
  ;; allow menus to be set up without ediff-wind.el being loaded
+ ;;;###autoload
  (defvar ediff-window-setup-function)
  
! ;; This macro is used to avoid compilation warnings.
! ;; The macro will expand into the form that is appropriate to the
! ;; compiler at hand (emacs or xemacs).
! ;; The autoload, below, is useless in Emacs because ediff-hook.el
! ;; is dumped with emacs, but it is needed in XEmacs
! ;;;###autoload
  (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
    (if (string-match "XEmacs" emacs-version)
        xemacs-form emacs-form))
   
! ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
! ;; emacs, but it is needed in XEmacs
! ;;;###autoload
! (ediff-cond-compile-for-xemacs-or-emacs
!  ;; xemacs form
!  (defun ediff-xemacs-init-menus ()
!    (if (featurep 'menubar)
!        (progn
!        (add-submenu
!         '("Tools") ediff-menu "OO-Browser...")
!        (add-submenu
!         '("Tools") ediff-merge-menu "OO-Browser...")
!        (add-submenu
!         '("Tools") epatch-menu "OO-Browser...")
!        (add-submenu
!         '("Tools") ediff-misc-menu "OO-Browser...")
!        (add-menu-button
!         '("Tools") "-------" "OO-Browser...")
!        )))
!  nil ; emacs form
!  )
  
  
+ ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
+ ;; emacs, but it is needed in XEmacs
+ ;;;###autoload
  (ediff-cond-compile-for-xemacs-or-emacs
   (progn
     (defvar ediff-menu