From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: sbaugh@catern.com Newsgroups: gmane.emacs.bugs Subject: bug#62732: 29.0.60; uniquify-trailing-separator-p affects any buffer whose name matches a dir in CWD Date: Sun, 09 Apr 2023 12:13:31 +0000 (UTC) Message-ID: <87a5zhmexh.fsf@catern.com> References: <87h6tpn8d5.fsf@catern.com> <87edotn7sx.fsf@catern.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2890"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 62732@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 09 14:14:16 2023 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 1plTvz-0000Qf-4L for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 09 Apr 2023 14:14:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plTvn-0003J7-HS; Sun, 09 Apr 2023 08:14:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1plTvm-0003Iy-55 for bug-gnu-emacs@gnu.org; Sun, 09 Apr 2023 08:14:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plTvl-0003Sa-SQ for bug-gnu-emacs@gnu.org; Sun, 09 Apr 2023 08:14:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plTvl-0006Q7-LG for bug-gnu-emacs@gnu.org; Sun, 09 Apr 2023 08:14:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: sbaugh@catern.com Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 09 Apr 2023 12:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62732 X-GNU-PR-Package: emacs Original-Received: via spool by 62732-submit@debbugs.gnu.org id=B62732.168104241924627 (code B ref 62732); Sun, 09 Apr 2023 12:14:01 +0000 Original-Received: (at 62732) by debbugs.gnu.org; 9 Apr 2023 12:13:39 +0000 Original-Received: from localhost ([127.0.0.1]:60340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plTvP-0006P8-8o for submit@debbugs.gnu.org; Sun, 09 Apr 2023 08:13:39 -0400 Original-Received: from s.wrqvwxzv.outbound-mail.sendgrid.net ([149.72.154.232]:40296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plTvN-0006On-C0 for 62732@debbugs.gnu.org; Sun, 09 Apr 2023 08:13:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=catern.com; h=from:subject:in-reply-to:references:mime-version:to:content-type: content-transfer-encoding:cc:content-type:from:subject:to; s=s1; bh=FP5ptdJhEYMpVyfVQz8/IOIwD00g8leNb30rALGBWvU=; b=HLZAZXWao50msID9bAKiJbofTfbzW9izQvXmmJIEnBQ6OU9lDyMxyXc1LyGpB6tmmZ9t kwbh4h+mnh7zbolWA5SPbCCCzWb4gaOzfr75lMFq9lJipNbiuhJGS1O6fGWYeT+cBsBvkb lyknOwGTfXqc7OKhJ+LyVGrHme1FwtZRFrXchMDQBcPl6r1pqbsoSmpkWVpkZWPJF94vfF usRD+fvMJrf2oG7KGd/YKXMBl36RHQPxaLyCFGEfOSd+riNnDJYLOZLmmeeu0LXo/mRr9V 5Hk0q6BJu9nCU53qQ7vyaWFnFCEKv2NcMNwQR0FdOxu4uCyyOqD526MmLbMBzgCQ== Original-Received: by filterdrecv-68f8d557c9-bsxpv with SMTP id filterdrecv-68f8d557c9-bsxpv-1-6432ABEB-2E 2023-04-09 12:13:31.751136809 +0000 UTC m=+4020119.600749193 Original-Received: from earth.catern.com (unknown) by geopod-ismtpd-15 (SG) with ESMTP id GhPmrrcLSCa7LX2pMumcDA for <62732@debbugs.gnu.org>; Sun, 09 Apr 2023 12:13:31.537 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=::1; helo=localhost; envelope-from=sbaugh@catern.com; receiver= Original-Received: from localhost (localhost [IPv6:::1]) by earth.catern.com (Postfix) with ESMTPSA id 1362C60091 for <62732@debbugs.gnu.org>; Sun, 9 Apr 2023 08:13:31 -0400 (EDT) In-Reply-To: <87edotn7sx.fsf@catern.com> (sbaugh@catern.com's message of "Sun, 09 Apr 2023 01:49:51 +0000 (UTC)") X-SG-EID: ZgbRq7gjGrt0q/Pjvxk7wM0yQFRdOkTJAtEbkjCkHbIh/bIniysfjlNHl9ggUi35Np/GvFrGVboVIsL9UzR48ObBo9Wug3kyBiYJhNsaq9YwNHZaLlD5Yg4R7o8Yfc3ntfruB+Aac2VHOtvH8cRl6PCE9P+CBV0cYBk6+skfaZpyWKq5yP0L61Op39PyHy8UQccIolax6fWYMFBQ6x1qVw== X-Entity-ID: d/0VcHixlS0t7iB1YKCv4Q== 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:259518 Archived-At: Ah, while I'm at it, here's a fix (based on the patch in the preceding mail) for a different bug which I just noticed: create-file-buffer's documentations states: >Emacs treats buffers whose names begin with a space as internal buffers. >To avoid confusion when visiting a file whose name begins with a space, >this function prepends a "|" to the final result if necessary. But uniquify renames the buffer away from having that "|". This patch fixes that bug. diff --git a/lisp/files.el b/lisp/files.el index c9433938729..e1e8e905fb0 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2079,9 +2079,10 @@ create-file-buffer (let* ((lastname (or basename (file-name-nondirectory filename))) (lastname (if (string= lastname "") filename lastname)) - (buf (generate-new-buffer (if (string-prefix-p " " lastname) - (concat "|" lastname) - lastname)))) + (basename (if (string-prefix-p " " lastname) + (concat "|" lastname) + lastname)) + (buf (generate-new-buffer basename))) (uniquify--create-file-buffer-advice buf filename basename) buf)) diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 6c0f5468faa..ad6f9797381 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -485,7 +485,7 @@ uniquify--create-file-buffer-advice "Uniquify buffer names with parts of directory name." (when uniquify-buffer-name-style (uniquify-rationalize-file-buffer-names - (or basename (file-name-nondirectory filename)) + basename (file-name-directory (expand-file-name (directory-file-name filename))) buf)))