Fix last change on rcirc-print and rcirc-decode-coding-system

2 files changed, 11 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 307aac72bc5..1769629115c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-01  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-decode-coding-system): Revert last change;
+        improve doc-string as suggested by Marco Pessotto
+        <melmothx@gmail.com>.
+        (rcirc-print): Fix last change.
+
 2011-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuffer.el (complete-with-action): Return nil for the metadata and
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index b1ee4c45373..bd9d6846a4b 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -314,11 +314,11 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT."
   :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 @@ record activity."
               (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)