emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp ChangeLog net/rcirc.el


From: Glenn Morris
Subject: [Emacs-diffs] emacs/lisp ChangeLog net/rcirc.el
Date: Thu, 15 Oct 2009 06:50:39 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/15 06:50:38

Modified files:
        lisp           : ChangeLog 
        lisp/net       : rcirc.el 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16429&r2=1.16430
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/rcirc.el?cvsroot=emacs&r1=1.53&r2=1.54

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16429
retrieving revision 1.16430
diff -u -b -r1.16429 -r1.16430
--- ChangeLog   15 Oct 2009 06:10:45 -0000      1.16429
+++ ChangeLog   15 Oct 2009 06:50:34 -0000      1.16430
@@ -1,3 +1,10 @@
+2009-10-15  Ryan Yeske  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32-fns.el (w32-batch-update-autoloads): Take autoload-make-program

Index: net/rcirc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/rcirc.el,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- net/rcirc.el        2 Oct 2009 03:48:45 -0000       1.53
+++ net/rcirc.el        15 Oct 2009 06:50:38 -0000      1.54
@@ -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\" \"address@hidden"))"
   :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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]