diff options
| author | Paul Eggert <[email protected]> | 2011-05-30 09:12:16 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-05-30 09:12:16 -0700 |
| commit | de677ace77fa48962be80b668662a7009498e5d6 (patch) | |
| tree | b596bc66c98f21f39fcf11b676c974161ba94f4e /lisp | |
| parent | 703f86387fd680855fce275bc87a524ac8d746bf (diff) | |
| parent | 3687c2efb7e7a5b6afbf87588a248431ccc8dd65 (diff) | |
Merge from trunk.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d4752efec..0064bb7954 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-05-30 Leo Liu <[email protected]> + + * net/rcirc.el (rcirc-debug-buffer): Use visible buffer name. + (rcirc-print): Decode all incoming messages (bug#8744). + (rcirc-decode-coding-system): Allow value nil for automatic coding + system detection. + 2011-05-29 Chong Yidong <[email protected]> * image.el (image-animate-max-time): Allow nil and t values. diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 47085af85f..b1ee4c4537 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -314,9 +314,11 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." :type 'boolean :group 'rcirc) -(defcustom rcirc-decode-coding-system 'utf-8 - "Coding system used to decode incoming irc messages." +(defcustom rcirc-decode-coding-system nil + "Coding system used to decode incoming irc messages. +If nil automatically detect the coding system." :type 'coding-system + :version "24.1" :group 'rcirc) (defcustom rcirc-encode-coding-system 'utf-8 @@ -616,7 +618,7 @@ last ping." (setq header-line-format (format "%f" (- (rcirc-float-time) (string-to-number message)))))) -(defvar rcirc-debug-buffer " *rcirc debug*") +(defvar rcirc-debug-buffer "*rcirc debug*") (defvar rcirc-debug-flag nil "If non-nil, write information to `rcirc-debug-buffer'.") (defun rcirc-debug (process text) @@ -1480,9 +1482,9 @@ 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)))) (unless (string= sender (rcirc-nick process)) - ;; only decode text from other senders, not ours - (setq text (decode-coding-string text rcirc-decode-coding-system)) ;; mark the line with overlay arrow (unless (or (marker-position overlay-arrow-position) (get-buffer-window (current-buffer)) |