diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-03-05 04:09:24 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-03-05 04:09:24 +0000 |
| commit | 388059876ac4a5aa55149e0544f58118742c5020 (patch) | |
| tree | 1998506c19d7e9d9f6f8b513dc1e3566fcc1397d /lisp/ediff-hook.el | |
| parent | 3405b0dfde50d1f5e5983b84cbd5ead7490c7fd1 (diff) | |
| download | emacs-388059876ac4a5aa55149e0544f58118742c5020.tar.gz | |
* 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.
Diffstat (limited to 'lisp/ediff-hook.el')
| -rw-r--r-- | lisp/ediff-hook.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index fb33c80ee6e..c44282f33a1 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -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 |