[Emacs-diffs] emacs/lisp/gnus mml.el nnrss.el ChangeLog

[Katsumi Yamaoka]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Katsumi Yamaoka <yamaoka>       09/09/10 00:12:08

Modified files:
        lisp/gnus      : mml.el nnrss.el ChangeLog 

Log message:
        * nnrss.el (nnrss-request-article): Remove binding of
        default-enable-multibyte-characters that has gotten needless by
        the 2007-07-13 change in rfc2047-encode-message-header.
        
        * mml.el (mml-insert-multipart): Error on the message header.
        (mml-insert-part): Error on the message header; position point at
        the end of a MIME tag.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mml.el?cvsroot=emacs&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/nnrss.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.828&r2=1.829

Patches:
Index: mml.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml.el,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- mml.el      9 Sep 2009 09:28:44 -0000       1.64
+++ mml.el      10 Sep 2009 00:12:07 -0000      1.65
@@ -1387,20 +1387,23 @@
                 (file-name-nondirectory file))))))
 
 (defun mml-insert-multipart (&optional type)
-  (interactive (list (completing-read "Multipart type (default mixed): "
-                                     '(("mixed") ("alternative") ("digest") 
("parallel")
+  (interactive (if (message-in-body-p)
+                  (list (completing-read "Multipart type (default mixed): "
+                                         '(("mixed") ("alternative")
+                                           ("digest") ("parallel")
                                        ("signed") ("encrypted"))
-                                     nil nil "mixed")))
+                                         nil nil "mixed"))
+                (error "Use this command in the message body")))
   (or type
       (setq type "mixed"))
   (mml-insert-empty-tag "multipart" 'type type)
   (forward-line -1))
 
 (defun mml-insert-part (&optional type)
-  (interactive
-   (list (mml-minibuffer-read-type "")))
-  (mml-insert-tag 'part 'type type 'disposition "inline")
-  (forward-line -1))
+  (interactive (if (message-in-body-p)
+                  (list (mml-minibuffer-read-type ""))
+                (error "Use this command in the message body")))
+  (mml-insert-tag 'part 'type type 'disposition "inline"))
 
 (declare-function message-subscribed-p "message" ())
 (declare-function message-make-mail-followup-to "message"

Index: nnrss.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nnrss.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- nnrss.el    27 Aug 2009 05:19:43 -0000      1.29
+++ nnrss.el    10 Sep 2009 00:12:07 -0000      1.30
@@ -226,8 +226,6 @@
              (link (nth 2 e))
              (enclosure (nth 7 e))
              (comments (nth 8 e))
-             ;; Enable encoding of Newsgroups header in XEmacs.
-             (default-enable-multibyte-characters t)
              (rfc2047-header-encoding-alist
               (if (mm-coding-system-p 'utf-8)
                   (cons '("Newsgroups" . utf-8)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -b -r1.828 -r1.829
--- ChangeLog   9 Sep 2009 10:41:50 -0000       1.828
+++ ChangeLog   10 Sep 2009 00:12:07 -0000      1.829
@@ -1,3 +1,13 @@
+2009-09-10  Katsumi Yamaoka  <address@hidden>
+
+       * nnrss.el (nnrss-request-article): Remove binding of
+       default-enable-multibyte-characters that has gotten needless by
+       the 2007-07-13 change in rfc2047-encode-message-header.
+
+       * mml.el (mml-insert-multipart): Error on the message header.
+       (mml-insert-part): Error on the message header; position point at
+       the end of a MIME tag.
+
 2009-09-09  Katsumi Yamaoka  <address@hidden>
 
        * gnus-util.el (with-no-warnings): Define it for old Emacsen.