* menu-bar.el (menu-bar-file-menu): Do not hardbind key display

for exit-emacs item.  Bind it to save-buffers-kill-terminal.

* diff-mode.el (diff-mode-menu): Do not assume whitespace-mode is
loaded.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 232bc70a57cc72aaf72a0d06ea4c19403d45b434..8c9005237b64f9e1c1f30a7cd9ae10732cae5f9a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-13  Chong Yidong  <cyd@stupidchicken.com>
+
+       * menu-bar.el (menu-bar-file-menu): Do not hardbind key display
+       for exit-emacs item.  Bind it to save-buffers-kill-terminal.
+
+       * diff-mode.el (diff-mode-menu): Do not assume whitespace-mode is
+       loaded.
+
 2009-01-13  Jason Rumney  <jasonr@gnu.org>
 
        * faces.el (face-valid-attribute-values): No stipple on w32. (Bug#884)