rcirc update

[Ryan Yeske]

I have a couple small changes to rcirc.el.

If this could be reviewed and installed in CVS that would be great.

Thanks,
Ryan


2009-10-02  Ryan Yeske  <address@hidden>

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



Index: rcirc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/rcirc.el,v
retrieving revision 1.52
diff -c -r1.52 rcirc.el
*** rcirc.el    2 Sep 2009 03:20:48 -0000       1.52
--- rcirc.el    2 Oct 2009 00:09:08 -0000
***************
*** 193,207 ****
  The valid METHOD symbols are `nickserv', `chanserv' and
  `bitlbee'.
  
! The required ARGUMENTS for each METHOD symbol are:
!   `nickserv': NICK PASSWORD
    `chanserv': NICK CHANNEL PASSWORD
    `bitlbee': NICK PASSWORD
  
! Example:
   ((\"freenode\" nickserv \"bob\" \"p455w0rd\")
    (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\")
!   (\"bitlbee\" bitlbee \"robert\" \"sekrit\"))"
    :type '(alist :key-type (string :tag "Server")
                :value-type (choice (list :tag "NickServ"
                                          (const nickserv)
--- 193,208 ----
  The valid METHOD symbols are `nickserv', `chanserv' and
  `bitlbee'.
  
! The ARGUMENTS for each METHOD symbol are:
!   `nickserv': NICK PASSWORD [NICKSERV-NICK]
    `chanserv': NICK CHANNEL PASSWORD
    `bitlbee': NICK PASSWORD
  
! Examples:
   ((\"freenode\" nickserv \"bob\" \"p455w0rd\")
    (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\")
!   (\"bitlbee\" bitlbee \"robert\" \"sekrit\")
!   (\"dal.net\" nickserv \"bob\" \"sekrit\" \"address@hidden"))"
    :type '(alist :key-type (string :tag "Server")
                :value-type (choice (list :tag "NickServ"
                                          (const nickserv)
***************
*** 1538,1543 ****
--- 1539,1552 ----
        (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,1634 ****
  (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)
  
--- 1637,1642 ----
***************
*** 2553,2563 ****
        (when (and (string-match server rcirc-server)
                   (string-match nick rcirc-nick))
          (cond ((equal method 'nickserv)
                 (rcirc-send-string
                  process
!                 (concat
!                  "PRIVMSG nickserv :identify "
!                  (car args))))
                ((equal method 'chanserv)
                 (rcirc-send-string
                  process
--- 2561,2572 ----
        (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-nick " :identify "
!                         password))))
                ((equal method 'chanserv)
                 (rcirc-send-string
                  process