[Emacs-diffs] emacs/lisp/mail rmail.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/01/31 10:08:38

Modified files:
        lisp/mail      : rmail.el 

Log message:
        (rmail-redecode-body): Don't change EOL conversion of the new encoding 
if
        the old one left it unspecified.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.485&r2=1.486

Patches:
Index: rmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -b -r1.485 -r1.486
--- rmail.el    31 Jan 2009 09:31:52 -0000      1.485
+++ rmail.el    31 Jan 2009 10:08:37 -0000      1.486
@@ -2687,9 +2687,10 @@
            ;; Make sure the new coding system uses the same EOL
            ;; conversion, to prevent ^M characters from popping up
            ;; all over the place.
+           (let ((eol-type (coding-system-eol-type old-coding)))
+             (if (numberp eol-type)
            (setq coding
-                 (coding-system-change-eol-conversion
-                  coding (coding-system-eol-type old-coding)))
+                       (coding-system-change-eol-conversion coding eol-type))))
            ;; If old-coding is `undecided', encode-coding-region
            ;; will not encode the text at all.  Find a proper
            ;; non-trivial encoding to use.