From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Fran Litterio Newsgroups: gmane.emacs.bugs Subject: bug#21187: erc-kill-channel-hook sometimes is not run during /QUIT Date: Tue, 4 Aug 2015 17:56:23 +0000 (UTC) Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1438711047 6585 80.91.229.3 (4 Aug 2015 17:57:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 4 Aug 2015 17:57:27 +0000 (UTC) To: 21187@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Aug 04 19:57: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 1ZMgSd-0000Q9-Jl for geb-bug-gnu-emacs@m.gmane.org; Tue, 04 Aug 2015 19:57:11 +0200 Original-Received: from localhost ([::1]:36627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMgSc-0001CO-Rj for geb-bug-gnu-emacs@m.gmane.org; Tue, 04 Aug 2015 13:57:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMgSY-0001BW-HN for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 13:57:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMgSU-0004Gb-Hc for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 13:57:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:38222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMgSU-0004GT-E6 for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 13:57:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZMgSU-0000fH-5p for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 13:57:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Fran Litterio Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 04 Aug 2015 17:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 21187 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.14387109992496 (code B ref -1); Tue, 04 Aug 2015 17:57:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 Aug 2015 17:56:39 +0000 Original-Received: from localhost ([127.0.0.1]:39668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZMgS6-0000eB-Mk for submit@debbugs.gnu.org; Tue, 04 Aug 2015 13:56:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48656) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZMgS4-0000dy-1L for submit@debbugs.gnu.org; Tue, 04 Aug 2015 13:56:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMgS3-00043w-3n for submit@debbugs.gnu.org; Tue, 04 Aug 2015 13:56:35 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:51764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMgS3-00043r-1c for submit@debbugs.gnu.org; Tue, 04 Aug 2015 13:56:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMgS2-0000wf-7k for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 13:56:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMgRy-00043A-7W for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 13:56:34 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:35819) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMgRy-00042w-02 for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 13:56:30 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZMgRw-0008TG-Bp for bug-gnu-emacs@gnu.org; Tue, 04 Aug 2015 19:56:28 +0200 Original-Received: from interv03.i.subnet.rcn.com ([146.115.9.234]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 04 Aug 2015 19:56:28 +0200 Original-Received: from flitterio by interv03.i.subnet.rcn.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 04 Aug 2015 19:56:28 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: sea.gmane.org User-Agent: Loom/3.14 (http://gmane.org/) X-Loom-IP: 146.115.9.234 (Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.125 Safari/537.36) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:105304 Archived-At: 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))) (run-hooks 'erc-kill-channel-hook)) (t (run-hooks 'erc-kill-buffer-hook)))))