Commit 108bf785 authored by Leo Liu's avatar Leo Liu

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

parent 67a0931d
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> 2011-05-31 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (complete-with-action): Return nil for the metadata and * minibuffer.el (complete-with-action): Return nil for the metadata and
......
...@@ -314,11 +314,11 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." ...@@ -314,11 +314,11 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT."
:type 'boolean :type 'boolean
:group 'rcirc) :group 'rcirc)
(defcustom rcirc-decode-coding-system nil (defcustom rcirc-decode-coding-system 'utf-8
"Coding system used to decode incoming irc messages. "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 :type 'coding-system
:version "24.1"
:group 'rcirc) :group 'rcirc)
(defcustom rcirc-encode-coding-system 'utf-8 (defcustom rcirc-encode-coding-system 'utf-8
...@@ -1482,8 +1482,7 @@ record activity." ...@@ -1482,8 +1482,7 @@ record activity."
(old-point (point-marker)) (old-point (point-marker))
(fill-start (marker-position rcirc-prompt-start-marker))) (fill-start (marker-position rcirc-prompt-start-marker)))
(setq text (decode-coding-string text (or rcirc-decode-coding-system (setq text (decode-coding-string text rcirc-decode-coding-system))
(detect-coding-string text t))))
(unless (string= sender (rcirc-nick process)) (unless (string= sender (rcirc-nick process))
;; mark the line with overlay arrow ;; mark the line with overlay arrow
(unless (or (marker-position overlay-arrow-position) (unless (or (marker-position overlay-arrow-position)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment