From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#21187: erc-kill-channel-hook sometimes is not run during /QUIT Date: Sun, 27 Dec 2015 08:57:41 +0100 Message-ID: <87d1tsiaru.fsf@gnus.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1451203167 25485 80.91.229.3 (27 Dec 2015 07:59:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 27 Dec 2015 07:59:27 +0000 (UTC) Cc: 21187@debbugs.gnu.org To: Fran Litterio Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 27 08:59:12 2015 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 1aD6ER-000271-FS for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Dec 2015 08:59:11 +0100 Original-Received: from localhost ([::1]:40982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aD6EQ-000213-QW for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Dec 2015 02:59:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aD6EN-00020w-MC for bug-gnu-emacs@gnu.org; Sun, 27 Dec 2015 02:59:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aD6EI-0000V8-Mn for bug-gnu-emacs@gnu.org; Sun, 27 Dec 2015 02:59:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aD6EI-0000V2-JX for bug-gnu-emacs@gnu.org; Sun, 27 Dec 2015 02:59:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aD6EI-0003Ug-Bl for bug-gnu-emacs@gnu.org; Sun, 27 Dec 2015 02:59:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 27 Dec 2015 07:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21187 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21187-submit@debbugs.gnu.org id=B21187.145120308613353 (code B ref 21187); Sun, 27 Dec 2015 07:59:02 +0000 Original-Received: (at 21187) by debbugs.gnu.org; 27 Dec 2015 07:58:06 +0000 Original-Received: from localhost ([127.0.0.1]:42377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aD6DN-0003TJ-OK for submit@debbugs.gnu.org; Sun, 27 Dec 2015 02:58:05 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:50294) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aD6DL-0003TA-R7 for 21187@debbugs.gnu.org; Sun, 27 Dec 2015 02:58:04 -0500 Original-Received: from 2.150.58.24.tmi.telenormobil.no ([2.150.58.24] helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1aD6D0-0003gT-7K; Sun, 27 Dec 2015 08:57:42 +0100 In-Reply-To: (Fran Litterio's message of "Tue, 4 Aug 2015 17:56:23 +0000 (UTC)") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.1.50 (gnu/linux) X-MailScanner-ID: 1aD6D0-0003gT-7K MailScanner-NULL-Check: 1451807862.53135@bK9WJPAnTsMwe4uBkFtLmA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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:110774 Archived-At: Fran Litterio writes: > Using Emacs built from the latest sources, when variable > erc-kill-queries-on-quit is t (which causes ERC to kill channel > buffers when quitting -- yes, the name is misleading), a /QUIT > does not run the hooks on erc-kill-channel-hook, because > erc-default-target returns nil due to the server being > disconnected. > > This patch fixes that by falling back to examining the buffer > name, which should be safe to do since we know the major mode is > erc-mode. > -- > Fran > flitterio gmail.com > > --- erc.el.orig 2015-08-04 13:38:04.602900800 -0400 > +++ erc.el 2015-08-04 13:38:56.538768600 -0400 > @@ -6698,7 +6698,7 @@ > (cond > ((eq (erc-server-buffer) (current-buffer)) > (run-hooks 'erc-kill-server-hook)) > - ((erc-channel-p (erc-default-target)) > + ((erc-channel-p (or (erc-default-target) (buffer-name))) Thanks; applied to Emacs 25.1. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no