From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#43192: lisp/files.el; 6d10b607d0 introduced bug that breaks C-x C-c Date: Fri, 04 Sep 2020 04:58:54 +0200 Message-ID: <87pn72fdsh.fsf@gnus.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10056"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 43192@debbugs.gnu.org To: Tom Gillespie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 04 05:00:11 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kE1xT-0002Wy-MH for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 04 Sep 2020 05:00:11 +0200 Original-Received: from localhost ([::1]:50262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kE1xS-0003xW-Ny for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 03 Sep 2020 23:00:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kE1xL-0003x0-7k for bug-gnu-emacs@gnu.org; Thu, 03 Sep 2020 23:00:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kE1xK-0005lw-Tw for bug-gnu-emacs@gnu.org; Thu, 03 Sep 2020 23:00:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kE1xK-0004ul-Rr for bug-gnu-emacs@gnu.org; Thu, 03 Sep 2020 23:00:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 04 Sep 2020 03:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43192 X-GNU-PR-Package: emacs Original-Received: via spool by 43192-submit@debbugs.gnu.org id=B43192.159918835318797 (code B ref 43192); Fri, 04 Sep 2020 03:00:02 +0000 Original-Received: (at 43192) by debbugs.gnu.org; 4 Sep 2020 02:59:13 +0000 Original-Received: from localhost ([127.0.0.1]:36731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE1wX-0004t6-GX for submit@debbugs.gnu.org; Thu, 03 Sep 2020 22:59:13 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:42734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE1wW-0004sr-3O for 43192@debbugs.gnu.org; Thu, 03 Sep 2020 22:59:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=MIBkrah0yll4VW02nDbSdE7l+g1BBNd0Rphbh/hQmMc=; b=cl2ZZYQDrWfD5SD5eEqGxvxm3P LZ4Lgkn/aPHOR+VqS7R1ZtVHZ3EX/VOabwZaNdwXYv3EHbDCFRXmm8m/brxJxgsPeyw8iGjH6lUcK oWrgo2l1nCXoplkiY4SDY6XmL+jEEfWwSoVFyD6O316US4DhfdANO6Pckat1rFwvQbA4=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kE1wG-0001Wc-72; Fri, 04 Sep 2020 04:59:05 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAAAAAByaaZbAAAABGdBTUEAALGPC/xhBQAAAAJi S0dEAP+Hj8y/AAAAB3RJTUUH5AkEAiEukL7KUAAAAOFJREFUSMftlL0RwjAMhT9+KspcjgXUsAJT vF2ymcah8AysQBNsyfg4OBqK6C6FLH/Wk1+S3cx3sf9y/wZswAb8AhzHy7LiIQP8HSDPeUxHgPKW D2bwp452gtQBCnUWUJAlE1jfwUId4VFUWR+Aw2kd83q+rUuX+zTVBBA2nf3WdVCxRa2ZkcOq4irJ y3rzsiCgqrV+aFO6l3jJudsxHrQUcEp2wXPLABQDH3jmMtqLEo2Lwjt57ZQkCYQLyDakIZpxVstm 2XiGwHPzqwc5dnOQbAW8/xjGwOfxhz+BDfgP4AH+CjRRsIuwngAAACV0RVh0ZGF0ZTpjcmVhdGUA MjAyMC0wOS0wNFQwMjozMzo0NiswMDowMPP95CEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDkt MDRUMDI6MzM6NDYrMDA6MDCCoFydAAAAAElFTkSuQmCC X-Now-Playing: Machinedrum's _Vapor City Citizenship Programme_: "Don't 1 2 Lose U (Moresounds Remix)" In-Reply-To: (Tom Gillespie's message of "Thu, 3 Sep 2020 19:49:33 -0700") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:187065 Archived-At: Tom Gillespie writes: > #+begin_src diff > + (string-match > + (concat "\\<" > + (regexp-quote > + (file-name-nondirectory > + buffer-file-name)) > + "<[0-9]+>\\'") > + (buffer-name buffer))) > #+end_src > > This is the second statement in a call to `or'. buffer-file-name is > not guaranteed to be non-nil because buffers like *scratch* and > *Messages* exist. In many workflows for emacsclient opening to scratch > and closing again from scratch are common. I think it's just a typo -- the code should be: diff --git a/lisp/files.el b/lisp/files.el index 3403e257a1..5f5902d0cb 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5574,7 +5574,7 @@ save-some-buffers (concat "\\<" (regexp-quote (file-name-nondirectory - buffer-file-name)) + (buffer-file-name buffer))) "<[^>]*>\\'") (buffer-name buffer))) ;; The buffer name is similar to the I've now applied this to Emacs 28, and that fixes the test case in this bug report. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no