From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Liu Newsgroups: gmane.emacs.bugs Subject: bug#17045: 24.3.50; feature request: rcirc-reconnect Date: Tue, 08 Apr 2014 16:33:18 +0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1396946728 19461 80.91.229.3 (8 Apr 2014 08:45:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Apr 2014 08:45:28 +0000 (UTC) Cc: 17045@debbugs.gnu.org To: Sam Steingold Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Apr 08 10:45:22 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WXRej-00062R-MJ for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Apr 2014 10:45:21 +0200 Original-Received: from localhost ([::1]:38801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXRej-0002dM-BK for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Apr 2014 04:45:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXReZ-0002TX-Tw for bug-gnu-emacs@gnu.org; Tue, 08 Apr 2014 04:45:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WXReT-00043v-L8 for bug-gnu-emacs@gnu.org; Tue, 08 Apr 2014 04:45:11 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXReT-000410-96 for bug-gnu-emacs@gnu.org; Tue, 08 Apr 2014 04:45:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WXReS-0007jW-4z for bug-gnu-emacs@gnu.org; Tue, 08 Apr 2014 04:45:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Leo Liu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 08 Apr 2014 08:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17045 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17045-submit@debbugs.gnu.org id=B17045.139694667729674 (code B ref 17045); Tue, 08 Apr 2014 08:45:03 +0000 Original-Received: (at 17045) by debbugs.gnu.org; 8 Apr 2014 08:44:37 +0000 Original-Received: from localhost ([127.0.0.1]:40270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WXRe0-0007iW-VM for submit@debbugs.gnu.org; Tue, 08 Apr 2014 04:44:37 -0400 Original-Received: from mail-pd0-f174.google.com ([209.85.192.174]:45159) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WXRdw-0007iK-E8 for 17045@debbugs.gnu.org; Tue, 08 Apr 2014 04:44:33 -0400 Original-Received: by mail-pd0-f174.google.com with SMTP id y13so708460pdi.19 for <17045@debbugs.gnu.org>; Tue, 08 Apr 2014 01:44:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:face:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=u2TWeVxKz8mpBf4gnb52mZuxude4I5+1adkyaV6IMro=; b=CxdW7628KgqYpiLYy8v7eUoyfYnJECcgjCwXcieFyEFMYGnGWU6YkEfdUQoOhY9UP8 zQkW+z62l37IL25v8EZ8YdpNYC73fDQG2Rx6XvQjkynnqmrLfbZBrjKvJHBusaWsFVHy sOwTFbkx8J7BMJJcw93MRVw7rbTMr0eDxlfLorPMBJ1Eo96CIkLBaDSoL5+uelWSpKL+ /Y0xA7IUBIWzR4wG7XKjq4YT2gHuBMXDcKN4K8YVteJQ0WcxXTqf5UFXod+8CCqEh6GW szgVgR+UINWDfLIDyjs6ohUpWInwqWHw9ed+WLAYyxDiTWzAN5Vr2YQzU7BteMlgjSWr NTdA== X-Received: by 10.68.240.5 with SMTP id vw5mr2860893pbc.113.1396946671394; Tue, 08 Apr 2014 01:44:31 -0700 (PDT) Original-Received: from fortuna ([222.130.179.253]) by mx.google.com with ESMTPSA id el14sm6901255pac.31.2014.04.08.01.34.20 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 08 Apr 2014 01:44:30 -0700 (PDT) Face: iVBORw0KGgoAAAANSUhEUgAAACgAAAAoAgMAAADxkFD+AAAADFBMVEUvT09qWs3/pQD///+J kUVcAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9cBBwMLOd3veKQA AACuSURBVBjTldE9CgIxEAXgB+lEyFUC2wo5ikdZ8DSypxhMY7H9VuIVwlqkGRgnm59VsHGafIQ3 CZlAtmKIRaHETgYa12lqvEsPYKf8wXHsPGfqPaUM0g9aJPKFXkmNQmSDqwzz4Fpgpz+6WAPY2z5o uPJJpu0uypcl4nyCibMLQ8lCiVjayLoQvw5LsVKQuHPRR958HZbOcVsKeepcLxpByjycGvnKmY+c MBvrtyjfe0vmuLvdq/kAAAAASUVORK5CYII= In-Reply-To: (Sam Steingold's message of "Wed, 19 Mar 2014 22:33:25 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (CentOS 6.5) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:87868 Archived-At: On 2014-03-20 10:33 +0800, Sam Steingold wrote: > It is not nice to have to do M-x rcirc whenever the connection dies. > Would it be possible to incorporate something similar to > http://www.emacswiki.org/emacs/rcircReconnect > Please? > > In GNU Emacs 24.3.50.1 (x86_64-apple-darwin13.1.0, NS apple-appkit-1265.19) > of 2014-03-18 on sds-MacBook-Pro.local > Windowing system distributor `Apple', version 10.3.1265 > Configured using: > `configure --with-ns' Hi Sam, Would something like this suit your needs? Thanks for testing. - Leo === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2014-04-08 03:32:37 +0000 +++ lisp/net/rcirc.el 2014-04-08 08:27:11 +0000 @@ -521,6 +521,7 @@ (defvar rcirc-user-authenticated nil) (defvar rcirc-user-disconnect nil) (defvar rcirc-connecting nil) +(defvar rcirc-connection-info nil) (defvar rcirc-process nil) ;;;###autoload @@ -549,22 +550,23 @@ (set-process-sentinel process 'rcirc-sentinel) (set-process-filter process 'rcirc-filter) - (set (make-local-variable 'rcirc-process) process) - (set (make-local-variable 'rcirc-server) server) - (set (make-local-variable 'rcirc-server-name) server) ; Update when we get 001 response. - (set (make-local-variable 'rcirc-buffer-alist) nil) - (set (make-local-variable 'rcirc-nick-table) - (make-hash-table :test 'equal)) - (set (make-local-variable 'rcirc-nick) nick) - (set (make-local-variable 'rcirc-process-output) nil) - (set (make-local-variable 'rcirc-startup-channels) startup-channels) - (set (make-local-variable 'rcirc-last-server-message-time) - (current-time)) - - (set (make-local-variable 'rcirc-timeout-timer) nil) - (set (make-local-variable 'rcirc-user-disconnect) nil) - (set (make-local-variable 'rcirc-user-authenticated) nil) - (set (make-local-variable 'rcirc-connecting) t) + (setq-local rcirc-connection-info + (list server port nick user-name full-name startup-channels + password encryption)) + (setq-local rcirc-process process) + (setq-local rcirc-server server) + (setq-local rcirc-server-name server) ; Update when we get 001 response. + (setq-local rcirc-buffer-alist nil) + (setq-local rcirc-nick-table (make-hash-table :test 'equal)) + (setq-local rcirc-nick nick) + (setq-local rcirc-process-output nil) + (setq-local rcirc-startup-channels startup-channels) + (setq-local rcirc-last-server-message-time (current-time)) + + (setq-local rcirc-timeout-timer nil) + (setq-local rcirc-user-disconnect nil) + (setq-local rcirc-user-authenticated nil) + (setq-local rcirc-connecting t) (add-hook 'auto-save-hook 'rcirc-log-write) @@ -782,11 +784,11 @@ (defun rcirc-buffer-process (&optional buffer) "Return the process associated with channel BUFFER. With no argument or nil as argument, use the current buffer." - (or (get-buffer-process (if buffer - (with-current-buffer buffer - rcirc-server-buffer) - rcirc-server-buffer)) - rcirc-process)) + (let ((buffer (or buffer (if (buffer-live-p rcirc-server-buffer) + rcirc-server-buffer + (error "Server buffer deleted"))))) + (or (with-current-buffer buffer rcirc-process) + rcirc-process))) (defun rcirc-server-name (process) "Return PROCESS server name, given by the 001 response." @@ -2210,6 +2212,17 @@ reason rcirc-id-string)))) +(defun-rcirc-command reconnect (_) + "Reconnect to current server." + (interactive "i") + (with-rcirc-server-buffer + (unless (or rcirc-connecting (process-live-p process)) + (let ((conn-info (copy-sequence rcirc-connection-info))) + (setf (nth 5 conn-info) + (cl-remove-if-not #'rcirc-channel-p + (mapcar #'car rcirc-buffer-alist))) + (apply #'rcirc-connect conn-info))))) + (defun-rcirc-command nick (nick) "Change nick to NICK." (interactive "i")