From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ryan Yeske Newsgroups: gmane.emacs.devel Subject: rcirc update Date: Thu, 01 Oct 2009 17:11:31 -0700 Message-ID: <873a62lkng.fsf@freegeek.hackery.lan> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1254442335 3397 80.91.229.12 (2 Oct 2009 00:12:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 2 Oct 2009 00:12:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 02 02:12:07 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MtVkS-0005CP-HT for ged-emacs-devel@m.gmane.org; Fri, 02 Oct 2009 02:11:48 +0200 Original-Received: from localhost ([127.0.0.1]:42408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtVkR-0007s0-Uf for ged-emacs-devel@m.gmane.org; Thu, 01 Oct 2009 20:11:47 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtVkL-0007qc-VV for emacs-devel@gnu.org; Thu, 01 Oct 2009 20:11:41 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtVkH-0007la-G6 for emacs-devel@gnu.org; Thu, 01 Oct 2009 20:11:41 -0400 Original-Received: from [199.232.76.173] (port=52903 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtVkH-0007lX-6v for emacs-devel@gnu.org; Thu, 01 Oct 2009 20:11:37 -0400 Original-Received: from mail-pz0-f181.google.com ([209.85.222.181]:35658) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtVkG-0005aa-Sg for emacs-devel@gnu.org; Thu, 01 Oct 2009 20:11:37 -0400 Original-Received: by pzk11 with SMTP id 11so662857pzk.14 for ; Thu, 01 Oct 2009 17:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :message-id:mime-version:content-type; bh=5hNvNkkx3ltuXsSynfRruPH63kdCy2p2Sgrdph/sioA=; b=LVbkgO94fg5uIlSG04X6F5TJvTgh1+wkjftBbn5fURCT5y7Kg+qsTvVIw988oEf0GM tIAIdFB5k2GMIlop0tZvpDufp1RYwFsWd8G/SFcH72d8XKdRLKOwk/hnmZYgCyO+YlNI rsFgYk610BLazLaEOJzCN2FQA8U5sfQHk5UPI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:mime-version:content-type; b=u8fBIUwPXFgICOhNZc2eIHkgoveOKUYaNOOcMaa3jrOpUBR3F0nIcjaP9829L2Zrv7 cJwkwmQz9fnTElcQWM4GgoGM5rimZIQV+yd6gDzYGBNmYn88axBP89iBpgRE9y+TQszG 17weGj2DHpp6W3fA3LklhsOFUiBPG4mMbtl94= Original-Received: by 10.114.252.14 with SMTP id z14mr3071338wah.84.1254442295055; Thu, 01 Oct 2009 17:11:35 -0700 (PDT) Original-Received: from freegeek.hackery.lan (d64-180-71-78.bchsia.telus.net [64.180.71.78]) by mx.google.com with ESMTPS id 20sm336807pxi.8.2009.10.01.17.11.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Oct 2009 17:11:33 -0700 (PDT) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:115836 Archived-At: 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 * 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\" \"NickServ@services.dal.net\"))" :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