*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index a15e217cafe68b3d31e4a6aa2a9567c36f197818..378f715b2867ee4ec7244e7bf965d323e82178fd 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1966,6 +1966,21 @@ run most curses applications now.
 +++
 ** M-x diff uses Diff mode instead of Compilation mode.
 
++++
+** Diff mode key bindings changed.
+
+These are the new bindings:
+
+C-c C-e   diff-ediff-patch  (old M-A)
+C-c C-n   diff-restrict-view   (old M-r)
+C-c C-r   diff-reverse-direction  (old M-R)
+C-c C-u   diff-context->unified   (old M-U)
+C-c C-w   diff-refine-hunk  (old C-c C-r)
+
+To convert unified to context format, use C-u C-c C-u.
+In addition, C-c C-u now operates on the region
+in Transient Mark mode when the mark is active.
+
 +++
 ** You can now customize `fill-nobreak-predicate' to control where
 filling can break lines.  The value is now normally a list of
@@ -5893,6 +5908,8 @@ Currently, the following actions have been defined:
 - Mouse-2 on the read-only or modified status in the mode line (`%' or
 `*') toggles the status.
 
+- Mouse-3 on the major mode name displays a major mode menu.
+
 - Mouse-3 on the mode name displays a minor-mode menu.
 
 ** Hourglass pointer

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae61defbea26ead27640f419896e197c2289d8c4..e0be66f3b08cd4522fc9e8428816f1b7fc827605 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-01  Richard Stallman  <rms@gnu.org>
 
+       * diff-mode.el (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
+       M-r, M-R, M-A, M-SPC or M-DEL.
+       (diff-mode-map): diff-refine-hunk now on C-c C-w
+       (diff-mode-map): Bind C-c C-e, C-c C-n, C-c C-r, C-c C-u.
+
        * help-mode.el (help-mode): view-exit-action calls delete-window
        only when it is safe and possible.
 

diff --git a/man/ChangeLog b/man/ChangeLog
index 7337b1de8483ef9b88dcfcd7ab002888ca4ba01d..bd48e3f4f200f0062e23d18f23e3dc228761da74 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-01  Richard Stallman  <rms@gnu.org>
+
+       * emacs.texi (Top): Add Diff Mode to menu.
+
 2006-05-01  Aaron S. Hawley  <Aaron.Hawley@uvm.edu>
 
        * misc.texi (Diff Mode): New node.