(gdb-starting): Set gdb-running to t.

[bpt/emacs.git] / lisp / ediff-hook.el

diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 3bf006d..f1be60e 100644 (file)
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -44,41 +44,46 @@
 ;; end pacifier
 
 ;; allow menus to be set up without ediff-wind.el being loaded
+;;;###autoload
 (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.
+;; 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))
+
 (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
-   ))
-
-
+;; 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