Synch with Gnus.

diff --git a/GNUS-NEWS b/GNUS-NEWS
index 057a7f6..720c857 100644 (file)
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -1,3 +1,10 @@
+** Gnus changes since 5.8.
+
+*** MML (Mime compose) prefix changed from `M-m' to `C-c C-m'.
+
+This change was made to avoid conflict with the standard binding of
+`back-to-indentation', which is also useful in message mode.
+
 ** Gnus changes.
 
 The Gnus NEWS entries are short, but they reflect sweeping changes in

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cbdca5..e511a98 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-19  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * mml.el (mml-mode-map): Change mml prefix from `M-m' to `C-c C-m'
+       to avoid conflict with the standard `back-to-indentation'
+       binding. 
+
 2000-12-17 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-extern.el (mm-inline-external-body): g-a-m-h may be a handle.

diff --git a/lisp/mml.el b/lisp/mml.el
index 39f9dfa..1a1cbd7 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -668,7 +668,9 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
     (define-key map "s" sign)
     (define-key map "c" encrypt)
     ;;(define-key map "n" 'mml-narrow-to-part)
-    (define-key main "\M-m" map)
+    ;; `M-m' conflicts with `back-to-indentation'.
+    ;; (define-key main "\M-m" map)
+    (define-key main "\C-c\C-m" map)
     main))
 
 (easy-menu-define