[Emacs-diffs] emacs/lisp/gnus nnimap.el ChangeLog

[Reiner Steib]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Reiner Steib <rsteib>   08/11/29 15:26:50

Modified files:
        lisp/gnus      : nnimap.el ChangeLog 

Log message:
        (nnimap-demule-use-string-to-multibyte): New temporary
        variable for debugging bug#464 and bug#1174.
        (nnimap-demule): Use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/nnimap.el?cvsroot=emacs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.767&r2=1.768

Patches:
Index: nnimap.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/nnimap.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- nnimap.el   2 Jul 2008 13:17:41 -0000       1.49
+++ nnimap.el   29 Nov 2008 15:26:49 -0000      1.50
@@ -901,12 +901,35 @@
   (when (nnimap-possibly-change-server server)
     (nnoo-status-message 'nnimap server)))
 
+(defvar nnimap-demule-use-string-to-multibyte (fboundp 'string-to-multibyte)
+  "Temporary internal debug variable.
+If you have problems (UTF-8 not decoded correctly on IMAP) with
+the default value, please report it as a bug!")
+;; FIXME: Clarify if we need to make this variable conditional on the Emacs
+;; version (Emacs 22 vs. Emacs 23;Emacs 21 doesn't have `string-to-multibyte'
+;; anyhow).  --rsteib
+;;
+;; http://thread.gmane.org/gmane.emacs.gnus.general/67112
+;; (bug#464, reported by James Cloos)
+;; http://thread.gmane.org/gmane.emacs.bugs/21524
+;; (bug#1174, reported by Frank Schmitt)
+
 (defun nnimap-demule (string)
   ;; BEWARE: we used to use string-as-multibyte here which is braindead
   ;; because it will turn accidental emacs-mule-valid byte sequences
   ;; into multibyte chars.  --Stef
   ;; Reverted, braindead got 7.5 out of 10 on imdb, so it can't be
   ;; that bad. --Simon
+  (gnus-message 9 "nnimap-demule-use-string-to-multibyte: %s"
+               nnimap-demule-use-string-to-multibyte)
+  (if nnimap-demule-use-string-to-multibyte
+      ;; Stefan
+      (funcall (if (and (fboundp 'string-to-multibyte)
+                       (subrp (symbol-function 'string-to-multibyte)))
+                  'string-to-multibyte
+                'identity)
+              (or string "")))
+  ;; Simon
   (funcall (if (and (fboundp 'string-as-multibyte)
                    (subrp (symbol-function 'string-as-multibyte)))
               'string-as-multibyte

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -b -r1.767 -r1.768
--- ChangeLog   21 Nov 2008 22:26:54 -0000      1.767
+++ ChangeLog   29 Nov 2008 15:26:49 -0000      1.768
@@ -1,3 +1,9 @@
+2008-11-29  Reiner Steib  <address@hidden>
+
+       * nnimap.el (nnimap-demule-use-string-to-multibyte): New temporary
+       variable for debugging bug#464 and bug#1174.
+       (nnimap-demule): Use it.
+
 2008-11-21  Stefan Monnier  <address@hidden>
 
        * message.el (message-send-mail): Just set the buffer to unibyte