(rmail-redecode-body): If the old encoding is `undecided', call

find-coding-systems-region to find a proper non-trivial encoding.

2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afafe3d2204..6093b1c907b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmail.el (rmail-redecode-body): If the old encoding is
+        `undecided', call find-coding-systems-region to find a proper
+        non-trivial encoding.
+
 2006-10-07  Kevin Ryde  <user42@zip.com.au>
 
         * textmodes/reftex-vars.el (defgroup reftex): Update home page
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 473175e142b..b196d906f81 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2875,6 +2875,12 @@ iso-8859, koi8-r, etc."
                           (coding-system-change-eol-conversion
                            coding
                            (coding-system-eol-type old-coding)))
+                    ;; If old-coding is `undecided', encode-coding-region
+                    ;; will not encode the text at all.  Find a proper
+                    ;; non-trivial encoding to use.
+                    (if (memq (coding-system-base old-coding) '(nil undecided))
+                        (setq old-coding
+                              (car (find-coding-systems-region msgbeg msgend))))
                     (setq x-coding-header (point-marker))
                     (narrow-to-region msgbeg msgend)
                     (encode-coding-region (point) msgend old-coding)