[Emacs-diffs] /srv/bzr/emacs/trunk r101028: Ensure that erc-toggle-debug-irc-protocol logs protocol data.

[Chong Yidong]

------------------------------------------------------------
revno: 101028
author: Fran Litterio <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-08-08 18:13:53 -0400
message:
  Ensure that erc-toggle-debug-irc-protocol logs protocol data.
  http://lists.gnu.org/archive/html/emacs-devel/2010-07/msg01000.html
  
  * erc-backend.el (erc-server-filter-function): Call
  erc-log-irc-protocol.
  
  * erc.el (erc-toggle-debug-irc-protocol): Bind
  erc-toggle-debug-irc-protocol to t.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-backend.el
  lisp/erc/erc.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2010-05-08 18:47:07 +0000
+++ b/lisp/erc/ChangeLog        2010-08-08 22:13:53 +0000
@@ -1,3 +1,11 @@
+2010-08-08  Fran Litterio  <address@hidden>
+
+       * erc-backend.el (erc-server-filter-function): Call
+       erc-log-irc-protocol.
+
+       * erc.el (erc-toggle-debug-irc-protocol): Bind
+       erc-toggle-debug-irc-protocol to t.
+
 2010-05-07  Chong Yidong  <address@hidden>
 
        * Version 23.2 released.

=== modified file 'lisp/erc/erc-backend.el'
--- a/lisp/erc/erc-backend.el   2010-01-25 18:49:23 +0000
+++ b/lisp/erc/erc-backend.el   2010-08-08 22:13:53 +0000
@@ -574,6 +574,7 @@
                       nil
                     (substring erc-server-filter-data
                                (match-end 0))))
+            (erc-log-irc-protocol line nil)
             (erc-parse-server-response process line)))))))
 
 (defsubst erc-server-reconnect-p (event)

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2010-01-25 18:49:23 +0000
+++ b/lisp/erc/erc.el   2010-08-08 22:13:53 +0000
@@ -2306,14 +2306,14 @@
          (insert (erc-make-notice "This buffer displays all IRC protocol 
traffic exchanged with each server.\n"))
          (insert (erc-make-notice "Kill this buffer to terminate protocol 
logging.\n\n")))
        (use-local-map (make-sparse-keymap))
-       (local-set-key (kbd "RET") 'erc-toggle-debug-irc-protocol))
+       (local-set-key (kbd "t") 'erc-toggle-debug-irc-protocol))
       (add-hook 'kill-buffer-hook
                #'(lambda () (setq erc-debug-irc-protocol nil))
                nil 'local)
       (goto-char (point-max))
       (let ((inhibit-read-only t))
        (insert (erc-make-notice
-                (format "IRC protocol logging %s at %s -- Press ENTER to 
toggle logging.\n"
+                (format "IRC protocol logging %s at %s -- Press `t' to toggle 
logging.\n"
                         (if erc-debug-irc-protocol "disabled" "enabled")
                         (current-time-string))))))
     (setq erc-debug-irc-protocol (not erc-debug-irc-protocol))