[Emacs-diffs] /srv/bzr/emacs/trunk r104463: Fix last change on rcirc-print and rcirc-decode-coding-system

[Leo Liu]

------------------------------------------------------------
revno: 104463
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-01 16:10:42 +0800
message:
  Fix last change on rcirc-print and rcirc-decode-coding-system
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-01 03:35:49 +0000
+++ b/lisp/ChangeLog    2011-06-01 08:10:42 +0000
@@ -1,3 +1,10 @@
+2011-06-01  Leo Liu  <address@hidden>
+
+       * net/rcirc.el (rcirc-decode-coding-system): Revert last change;
+       improve doc-string as suggested by Marco Pessotto
+       <address@hidden>.
+       (rcirc-print): Fix last change.
+
 2011-05-31  Stefan Monnier  <address@hidden>
 
        * minibuffer.el (complete-with-action): Return nil for the metadata and

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-05-30 12:23:56 +0000
+++ b/lisp/net/rcirc.el 2011-06-01 08:10:42 +0000
@@ -314,11 +314,11 @@
   :type 'boolean
   :group 'rcirc)
 
-(defcustom rcirc-decode-coding-system nil
+(defcustom rcirc-decode-coding-system 'utf-8
   "Coding system used to decode incoming irc messages.
-If nil automatically detect the coding system."
+Set to 'undecided if you want the encoding of the incoming
+messages autodetected."
   :type 'coding-system
-  :version "24.1"
   :group 'rcirc)
 
 (defcustom rcirc-encode-coding-system 'utf-8
@@ -1482,8 +1482,7 @@
              (old-point (point-marker))
              (fill-start (marker-position rcirc-prompt-start-marker)))
 
-         (setq text (decode-coding-string text (or rcirc-decode-coding-system
-                                                   (detect-coding-string text 
t))))
+         (setq text (decode-coding-string text rcirc-decode-coding-system))
          (unless (string= sender (rcirc-nick process))
            ;; mark the line with overlay arrow
            (unless (or (marker-position overlay-arrow-position)