Avoid encoding errors in message.el

* lisp/gnus/message.el (message-clone-locals): Don't clone
message-default-charset.  (Bug#25645)

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 95eae6ba81143f9ba685d1184192b1a6984638ff..f874a0e3b8eed2337218be0f7d16811b26a51a14 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8060,8 +8060,13 @@ regexp VARSTR."
                  (or (null varstr)
                      (string-match varstr (symbol-name (car local)))))
         (ignore-errors
-          (set (make-local-variable (car local))
-               (cdr local)))))
+          ;; Cloning message-default-charset could cause an already
+          ;; encoded text to be encoded again, yielding raw bytes
+          ;; instead of characters in the message.
+          (unless (string-match "message-default-charset"
+                                (symbol-name (car local)))
+            (set (make-local-variable (car local))
+                 (cdr local))))))
      locals)))
 
 ;;;