diff lisp/ediff-hook.el @ 92493:402ee2cfca27

* bindings.el (mode-line-remote): Add mouse-face. Improve tooltip. (standard-mode-line-position): Add mouse-face. * progmodes/compile.el (compilation-menu-map): (compilation-mode-map): * progmodes/grep.el (grep-mode-map): Add :help. * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Define and initialize in one step. Add :help. Use :enable to activate menu items. Show the key binding for edebug-defun. (lisp-interaction-mode-map): Add a menu. * term.el (term-mode-map): Define and initialize in one step. * ediff-init.el (ediff-color-display-p): Simplify. (Xor): Remove unused function. (ediff-with-syntax-table): Simplify for emacs. * ediff-hook.el (menu-bar-ediff-menu): Don't depend on the menu-bar being loaded, it always is.

--- a/lisp/ediff-hook.el	Wed Mar 05 03:57:43 2008 +0000
+++ b/lisp/ediff-hook.el	Wed Mar 05 04:09:24 2008 +0000
@@ -154,9 +154,8 @@
 	    (not (featurep 'ediff-hook)))
 	   (ediff-xemacs-init-menus)))
 
- ;; Emacs--only if menu-bar is loaded
- (if (featurep 'menu-bar)
-     (progn
+ ;; Emacs
+ (progn
        ;; initialize menu bar keymaps
        (defvar menu-bar-ediff-misc-menu
 	 (make-sparse-keymap "Ediff Miscellanea"))
@@ -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