mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Leo Liu 2011-06-01 16:10:42 +08:00
parent 67a0931d39
commit 108bf785c8
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -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

9
lisp/net/rcirc.el
View File

@ -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)