changeset 109720:eb66d5d15b09

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.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 08 Aug 2010 18:13:53 -0400
parents 472b3dda3de7
children 54f0299502c6 b60dcdd855f0
files lisp/erc/ChangeLog lisp/erc/erc-backend.el lisp/erc/erc.el
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/erc/ChangeLog	Sun Aug 08 17:57:34 2010 -0400
+++ b/lisp/erc/ChangeLog	Sun Aug 08 18:13:53 2010 -0400
@@ -1,3 +1,11 @@
+2010-08-08  Fran Litterio  <flitterio@gmail.com>
+
+	* 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  <cyd@stupidchicken.com>
 
 	* Version 23.2 released.
--- a/lisp/erc/erc-backend.el	Sun Aug 08 17:57:34 2010 -0400
+++ b/lisp/erc/erc-backend.el	Sun Aug 08 18:13:53 2010 -0400
@@ -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)
--- a/lisp/erc/erc.el	Sun Aug 08 17:57:34 2010 -0400
+++ b/lisp/erc/erc.el	Sun Aug 08 18:13:53 2010 -0400
@@ -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))