[gnus git] branch master updated: m0-11-126-g94a04c7 =1= gnus-compat.el (string-bytes): Work for XEmacs

Katsumi <[email protected]> Tue, 27 Jan 2015 09:50:58 +0100
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  94a04c760c69d9541cb7fb198cbdb5528413cc23 (commit)
      from  b5dbae8d6c78bdbb1b47601ddc91fca012796927 (commit)


- Log -----------------------------------------------------------------
commit 94a04c760c69d9541cb7fb198cbdb5528413cc23
Author: Katsumi Yamaoka <[email protected]>
Date:   Tue Jan 27 08:50:44 2015 +0000

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc8f44b..706b172 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
+2015-01-27  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-compat.el (string-bytes): Work for XEmacs.
+
 2015-01-27  Lars Ingebrigtsen  <[email protected]>
 
-	* 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 86bcb8f..d286ea1 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)
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog      |    6 +++++-
 lisp/gnus-compat.el |    8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project