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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/03/05 04:09:26

Index: ediff-hook.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-hook.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- ediff-hook.el       8 Jan 2008 20:44:55 -0000       1.35
+++ ediff-hook.el       5 Mar 2008 04:09:24 -0000       1.36
@@ -154,8 +154,7 @@
            (not (featurep 'ediff-hook)))
           (ediff-xemacs-init-menus)))
 
- ;; Emacs--only if menu-bar is loaded
- (if (featurep 'menu-bar)
+ ;; Emacs
      (progn
        ;; initialize menu bar keymaps
        (defvar menu-bar-ediff-misc-menu
@@ -251,8 +250,6 @@
         '("Customize Ediff" . ediff-customize))
        (define-key menu-bar-ediff-misc-menu [ediff-doc]
         '("Ediff Manual" . ediff-documentation))
-       )
-
       ) ; emacs case
  ) ; ediff-cond-compile-for-xemacs-or-emacs