From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 27 Jan 2015 08:50:44 +0000 (+0000)
Subject: gnus-compat.el (string-bytes): Work for XEmacs
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=94a04c760c69d9541cb7fb198cbdb5528413cc23;ds=sidebyside

gnus-compat.el (string-bytes): Work for XEmacs
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc8f44bc4..706b1725d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
+2015-01-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-compat.el (string-bytes): Work for XEmacs.
+
 2015-01-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	* gnus-compat.el (fboundp): Avoid compilation error on XEmacs.
+	* gnus-compat.el (string-bytes): Avoid compilation error on XEmacs.
 
 	* nnir.el (nnir-imap-expr-to-imap): Check for literal+ capability in
 	IMAP.
diff --git a/lisp/gnus-compat.el b/lisp/gnus-compat.el
index 86bcb8f3c..d286ea104 100644
--- a/lisp/gnus-compat.el
+++ b/lisp/gnus-compat.el
@@ -146,8 +146,12 @@ one is kept."
 
 (unless (fboundp 'string-bytes)
   (defun string-bytes (string)
-    ;; This is a rather wrong definition that should be fixed.
-    (length string)))
+    (length (if (or (mm-coding-system-p 'utf-8)
+		    (ignore-errors
+		      (let (mucs-ignore-version-incompatibilities)
+			(require 'un-define))))
+		(encode-coding-string string 'utf-8)
+	      string))))
 
 (provide 'gnus-compat)