# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1255589434 0
# Node ID 01e892771abe4ee96cc81b08d28d12d0b540c537
# Parent  de20e5d8f6ebbfb04361666d49050c90193a706d
Ryan Yeske  <rcyeske at gmail.com>

(rcirc-view-log-file): New command.
(rcirc-track-minor-mode-map): Remove C-c ` binding.
(rcirc-authenticate, rcirc-authinfo): Allow nickserv-nick to be specified.

diff -r de20e5d8f6eb -r 01e892771abe lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 15 06:31:51 2009 +0000
+++ b/lisp/ChangeLog	Thu Oct 15 06:50:34 2009 +0000
@@ -1,3 +1,10 @@
+2009-10-15  Ryan Yeske  <rcyeske@gmail.com>
+
+	* net/rcirc.el (rcirc-view-log-file): New command.
+	(rcirc-track-minor-mode-map): Remove C-c ` binding.
+	(rcirc-authenticate, rcirc-authinfo): Allow nickserv-nick to be
+	specified.
+
 2009-10-15  Glenn Morris  <rgm@gnu.org>
 
 	* w32-fns.el (w32-batch-update-autoloads): Take autoload-make-program
diff -r de20e5d8f6eb -r 01e892771abe lisp/net/rcirc.el
--- a/lisp/net/rcirc.el	Thu Oct 15 06:31:51 2009 +0000
+++ b/lisp/net/rcirc.el	Thu Oct 15 06:50:34 2009 +0000
@@ -193,15 +193,16 @@
 The valid METHOD symbols are `nickserv', `chanserv' and
 `bitlbee'.
 
-The required ARGUMENTS for each METHOD symbol are:
-  `nickserv': NICK PASSWORD
+The ARGUMENTS for each METHOD symbol are:
+  `nickserv': NICK PASSWORD [NICKSERV-NICK]
   `chanserv': NICK CHANNEL PASSWORD
   `bitlbee': NICK PASSWORD
 
-Example:
+Examples:
  ((\"freenode\" nickserv \"bob\" \"p455w0rd\")
   (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\")
-  (\"bitlbee\" bitlbee \"robert\" \"sekrit\"))"
+  (\"bitlbee\" bitlbee \"robert\" \"sekrit\")
+  (\"dal.net\" nickserv \"bob\" \"sekrit\" \"NickServ@services.dal.net\"))"
   :type '(alist :key-type (string :tag "Server")
 		:value-type (choice (list :tag "NickServ"
 					  (const nickserv)
@@ -1538,6 +1539,14 @@
 	(write-region (point-min) (point-max) filename t 'quiet))))
   (setq rcirc-log-alist nil))
 
+(defun rcirc-view-log-file ()
+  "View logfile corresponding to the current buffer."
+  (interactive)
+  (find-file-other-window 
+   (expand-file-name (funcall rcirc-log-filename-function 
+			      (rcirc-buffer-process) rcirc-target)
+		     rcirc-log-directory)))
+
 (defun rcirc-join-channels (process channels)
   "Join CHANNELS."
   (save-window-excursion
@@ -1628,7 +1637,6 @@
 (defvar rcirc-track-minor-mode-map (make-sparse-keymap)
   "Keymap for rcirc track minor mode.")
 
-(define-key rcirc-track-minor-mode-map (kbd "C-c `") 'rcirc-next-active-buffer)
 (define-key rcirc-track-minor-mode-map (kbd "C-c C-@") 'rcirc-next-active-buffer)
 (define-key rcirc-track-minor-mode-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer)
 
@@ -2553,11 +2561,12 @@
 	(when (and (string-match server rcirc-server)
 		   (string-match nick rcirc-nick))
 	  (cond ((equal method 'nickserv)
+		 (let ((password (car args))
+		       (nickserv-nick (or (cadr args) "nickserv")))
 		 (rcirc-send-string
 		  process
-		  (concat
-		   "PRIVMSG nickserv :identify "
-		   (car args))))
+		  (concat "PRIVMSG " nickserv-nick " :identify "
+			  password))))
 		((equal method 'chanserv)
 		 (rcirc-send-string
 		  process