From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 14 Apr 2018 22:24:02 +0000 (+0200)
Subject: Rewrite string-as-unibyte/string-as-multibyte logic in nnmail
X-Git-Tag: emacs-27.0.90~5200
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad2c4d3c6166b6a02e6256f3aff171fbf5a2c80b;p=emacs.git

Rewrite string-as-unibyte/string-as-multibyte logic in nnmail

* lisp/gnus/nnmail.el (nnmail-insert-xref): Rewrite
string-as-unibyte/string-as-multibyte logic and confirm that the
result is the same in both multibyte and unibyte buffers after the
change.
---

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 249bd65a9d7..d751f182e30 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1250,10 +1250,10 @@ Return the number of characters in the body."
     (insert (format "Xref: %s" (system-name)))
     (while group-alist
       (insert (if (mm-multibyte-p)
-		  (string-as-multibyte
-		   (format " %s:%d" (caar group-alist) (cdar group-alist)))
-		(string-as-unibyte
-		 (format " %s:%d" (caar group-alist) (cdar group-alist)))))
+		  (format " %s:%d" (caar group-alist) (cdar group-alist))
+		(encode-coding-string
+		 (format " %s:%d" (caar group-alist) (cdar group-alist))
+		 'utf-8)))
       (setq group-alist (cdr group-alist)))
     (insert "\n")))