From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Deniz Dogan Newsgroups: gmane.emacs.devel Subject: Re: Reminder about feature freeze Date: Tue, 28 Jun 2011 17:54:16 +0200 Message-ID: <4E09F928.8040507@dogan.se> References: <8762nqf0s8.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000507000009030300040002" X-Trace: dough.gmane.org 1309276527 25618 80.91.229.12 (28 Jun 2011 15:55:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 28 Jun 2011 15:55:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jun 28 17:55:23 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QbadG-0004ZP-Mq for ged-emacs-devel@m.gmane.org; Tue, 28 Jun 2011 17:55:22 +0200 Original-Received: from localhost ([::1]:47318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbadF-0003ui-L4 for ged-emacs-devel@m.gmane.org; Tue, 28 Jun 2011 11:55:21 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qbacq-0003tt-Hy for emacs-devel@gnu.org; Tue, 28 Jun 2011 11:54:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qbaco-0002DH-30 for emacs-devel@gnu.org; Tue, 28 Jun 2011 11:54:56 -0400 Original-Received: from ch-smtp04.sth.basefarm.net ([80.76.153.5]:34801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qbacn-0002Cq-Cs for emacs-devel@gnu.org; Tue, 28 Jun 2011 11:54:53 -0400 Original-Received: from c80-216-105-155.bredband.comhem.se ([80.216.105.155]:60357 helo=[192.168.0.10]) by ch-smtp04.sth.basefarm.net with esmtp (Exim 4.76) (envelope-from ) id 1QbacE-00024r-Du for emacs-devel@gnu.org; Tue, 28 Jun 2011 17:54:20 +0200 User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.18) Gecko/20110616 Thunderbird/3.1.11 In-Reply-To: <8762nqf0s8.fsf@stupidchicken.com> X-Originating-IP: 80.216.105.155 X-Scan-Result: No virus found in message 1QbacE-00024r-Du. X-Scan-Signature: ch-smtp04.sth.basefarm.net 1QbacE-00024r-Du 84ff95d3916758a69ccc03d743185735 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.76.153.5 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:141133 Archived-At: This is a multi-part message in MIME format. --------------000507000009030300040002 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 2011-06-28 17:12, Chong Yidong wrote: > Just a reminder: the pretest is scheduled for late July, as discussed at > http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00953.html. > > In order to ensure a smooth transition to the pretest, I encourage > everyone who has a pending patch that implements a new feature to commit > it, or ask to have it committed, ASAP. If committing during July, > please discuss on emacs-devel first. > > If you're aware of any languishing patch that ought to be included in > Emacs 24, please point it out. Thanks. > I have a pending patch (attached) from Andreas Rottman which I have yet to deal with. He has signed the FSF papers and I guess that means that his patch should be fine to merge to trunk. The patch adds support to rcirc for connecting to the same server on different ports, e.g. localhost:6667 and localhost:7000. I am not sure I have time to test the patch properly before July so if anyone is willing to do so, feel free. Thanks, Deniz --------------000507000009030300040002 Content-Type: text/plain; name="rcirc-multiport.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="rcirc-multiport.diff" From: Andreas Rottmann Subject: Allow multiple rcirc connections to the same host * lisp/net/rcirc.el (rcirc): When collecting the already-connected servers list, consider both hostname and port, instead of hostname only. Also take the port into account on the messages displayed. (rcirc-connect): Include port number in "Connecting to" message. --- lisp/net/rcirc.el | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index f7f5f61..14b020a 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -473,20 +473,19 @@ If ARG is non-nil, instead prompt for connection parameters." (password (plist-get (cdr c) :password)) (encryption (plist-get (cdr c) :encryption))) (when server - (let (connected) + (let ((contact (list server port)) + connected) (dolist (p (rcirc-process-list)) - (when (string= server (process-name p)) + (when (equal contact (process-contact p)) (setq connected p))) (if (not connected) (condition-case e (rcirc-connect server port nick user-name full-name channels password encryption) - (quit (message "Quit connecting to %s" server))) - (with-current-buffer (process-buffer connected) - (setq connected-servers - (cons (process-contact (get-buffer-process - (current-buffer)) :host) - connected-servers)))))))) + (quit (message "Quit connecting to %s:%d" server port))) + (setq connected-servers + (cons (format "%s:%d" (car contact) (cadr contact)) + connected-servers))))))) (when connected-servers (message "Already connected to %s" (if (cdr connected-servers) @@ -515,7 +514,7 @@ If ARG is non-nil, instead prompt for connection parameters." (defun rcirc-connect (server &optional port nick user-name full-name startup-channels password encryption) (save-excursion - (message "Connecting to %s..." server) + (message "Connecting to %s:%s..." server port) (let* ((inhibit-eol-conversion) (port-number (if port (if (stringp port) -- tg: (b67be85..) t/rcirc-multiport (depends on: master) --------------000507000009030300040002--