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#64543: [PATCH] package-report-bug: don't fail on custom groups defined by eval Date: Wed, 12 Jul 2023 19:26:13 +0000 (UTC) Message-ID: <87ttu9j5ii.fsf@catern.com> References: <87351xm2ri.fsf@catern.com> <87edlfkg70.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22436"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 64543@debbugs.gnu.org To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jul 12 21:27:18 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 1qJfUb-0005Za-Ml for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 12 Jul 2023 21:27:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qJfUP-0001wP-UH; Wed, 12 Jul 2023 15:27:05 -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 1qJfUN-0001vw-2O for bug-gnu-emacs@gnu.org; Wed, 12 Jul 2023 15:27:03 -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 1qJfUM-0007U9-2N for bug-gnu-emacs@gnu.org; Wed, 12 Jul 2023 15:27:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qJfUL-0003Gg-Hu for bug-gnu-emacs@gnu.org; Wed, 12 Jul 2023 15:27: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: Wed, 12 Jul 2023 19:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64543 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64543-submit@debbugs.gnu.org id=B64543.168918998312482 (code B ref 64543); Wed, 12 Jul 2023 19:27:01 +0000 Original-Received: (at 64543) by debbugs.gnu.org; 12 Jul 2023 19:26:23 +0000 Original-Received: from localhost ([127.0.0.1]:52957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJfTj-0003FG-4R for submit@debbugs.gnu.org; Wed, 12 Jul 2023 15:26:23 -0400 Original-Received: from s.wrqvwxzv.outbound-mail.sendgrid.net ([149.72.154.232]:31216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJfTf-0003Eu-Dq for 64543@debbugs.gnu.org; Wed, 12 Jul 2023 15:26:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=catern.com; h=from:subject:in-reply-to:references:mime-version:to:cc:content-type: cc:content-type:from:subject:to; s=s1; bh=G8kywpdFVNLakVjW0mP56JD2aQx4B7iq8+EeocYuzWA=; b=LGGxjNfYVHbL/MV2D+kUX282ZTsny+EPJImn4p2k5G4W9nXyEPLJkHUp2NIadietfstu 8/3/Gj4/UTBPkUnnBgvXS8mAYWyybey6rmACcx5610mY+fNtjaa+8WwHOoiFHfx4FfLEoC n2JibnN1Kn+C2bAAZDdKNE4YOrkMwcAg+sXI/blHvWmYyZ+7DtOwgJCRI8jnjGQbIrYqx8 rMAriEUXtiBj+FI/kOQpnSWbXQ4jmB415P+x2US21SnSNON4Qpd4NU/nxI8bmf1Rbo5iDW 4peF+CtMqQVfEU7ZqbVUTupEkTRGg55CKiMakEzkMDVUy/KguKeh6Yp8d/5tIGdQ== Original-Received: by filterdrecv-66949dbc98-rr4mv with SMTP id filterdrecv-66949dbc98-rr4mv-1-64AEFE55-34 2023-07-12 19:26:13.699570191 +0000 UTC m=+1529429.464332959 Original-Received: from earth.catern.com (unknown) by geopod-ismtpd-1 (SG) with ESMTP id X5OKlLJxTmurcTOwsynBOg Wed, 12 Jul 2023 19:26:13.584 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=::1; helo=localhost; envelope-from=sbaugh@catern.com; receiver=posteo.net Original-Received: from localhost (localhost [IPv6:::1]) by earth.catern.com (Postfix) with ESMTPSA id 1C85D6009C; Wed, 12 Jul 2023 15:26:13 -0400 (EDT) In-Reply-To: <87edlfkg70.fsf@posteo.net> (Philip Kaludercic's message of "Mon, 10 Jul 2023 14:13:23 +0000") X-SG-EID: ZgbRq7gjGrt0q/Pjvxk7wM0yQFRdOkTJAtEbkjCkHbIoHjcnq2sgG+sZZqVAwNnWqgMyWSfMNgvxDtr4xv86dvE/NMagIxWftJXmt1vKdouFNiuMlmJGOCQMlwgo4sCRRA8co03bLGr33M+3SkIubtPVDwNeuzsCfMSej6Jh1Tk/dEQxj3INbVXkNt6o/9X0HvUgE6SE4Mhg+DfEVBf2AA== 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:264981 Archived-At: --=-=-= Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Philip Kaludercic writes: > sbaugh@catern.com writes: > > Thanks, > >> From: Spencer Baugh >> Date: Sun, 9 Jul 2023 12:59:50 -0400 >> Subject: [PATCH] package-report-bug: don't fail on custom groups defined by >> eval >> >> Previously we just assumed that the car of an element of >> custom-current-group-alist was a filename. But actually it can be nil >> if a custom group was defined by just evaling Lisp. > > Where is this behaviour documented? I couldn't reproduce it with a > simple experiment. To reproduce: M-: (defgroup mygroup nil "my group") RET I don't think it's documented anywhere? custom-current-group-alist is not documented so this wouldn't be either. >> * lisp/emacs-lisp/package.el (package-report-bug): Don't fail when a >> custom group was defined by eval. >> --- >> lisp/emacs-lisp/package.el | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el >> index 3e6acd9b388..f67e99e04b5 100644 >> --- a/lisp/emacs-lisp/package.el >> +++ b/lisp/emacs-lisp/package.el >> @@ -4642,6 +4642,7 @@ package-report-bug >> (boundp (car ent)) >> (not (eq (custom--standard-value (car ent)) >> (default-toplevel-value (car ent)))) >> + (car group) > > If you are checking for (car group), when do this in the loop instead > of wrapping the entire `dolist'? Good point. I was just copying the last condition in the and. Lifted them both out of the loop: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Support-transforming-the-dirname-used-by-uniquify.patch >From 2873d4c482acfd1ced749d593fd512c408e0a578 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 9 Jul 2023 22:21:03 -0400 Subject: [PATCH] Support transforming the dirname used by uniquify By transforming the dirname, we can add additional information to use during uniquifying. A basic one: uniquifying buffer names based on the project name. * lisp/progmodes/project.el (project-uniquify-dirname-transform): Add. * lisp/uniquify.el (uniquify-dirname-transform-default) (uniquify-dirname-transform): Add. (bug#62621) (uniquify-rationalize-file-buffer-names, uniquify-buffer-file-name): Use uniquify-dirname-transform. * test/lisp/uniquify-tests.el (uniquify-home, uniquify-project-transform): Add tests. --- lisp/progmodes/project.el | 12 ++++++++++++ lisp/uniquify.el | 26 +++++++++++++++++++++----- test/lisp/uniquify-tests.el | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index d482cc24d70..78f9fb410c1 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -1835,5 +1835,17 @@ project-switch-project (let ((project-current-directory-override dir)) (call-interactively command)))) +;;;###autoload +(defun project-uniquify-dirname-transform (dirname) + "Include `project-name' in DIRNAME if in a project." + (if-let (proj (project-current nil dirname)) + (let ((root (project-root proj))) + (expand-file-name + (file-name-concat + (file-name-directory root) + (project-name proj) + (file-relative-name dirname root)))) + dirname)) + (provide 'project) ;;; project.el ends here diff --git a/lisp/uniquify.el b/lisp/uniquify.el index d1ca455b673..b2f28a10d51 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -168,6 +168,20 @@ uniquify-list-buffers-directory-modes That means that when `buffer-file-name' is set to nil, `list-buffers-directory' contains the name of the directory which the buffer is visiting.") +(defun uniquify-dirname-transform-default (dirname) + "Simply return DIRNAME unchanged." + dirname) + +(defcustom uniquify-dirname-transform #'uniquify-dirname-transform-default + "A function to transform the dirname used to uniquify a buffer. + +It takes a single argument: the directory of the buffer. It +should return a string filename (which does not need to actually +exist in the filesystem) to use for uniquifying the buffer name." + :type '(choice (function-item uniquify-dirname-transform-default) + function) + :group 'uniquify) + ;;; Utilities ;; uniquify-fix-list data structure @@ -209,7 +223,8 @@ uniquify-rationalize-file-buffer-names ;; this buffer. (with-current-buffer newbuf (setq uniquify-managed nil)) (when dirname - (setq dirname (expand-file-name (directory-file-name dirname))) + (setq dirname (funcall uniquify-dirname-transform + (expand-file-name (directory-file-name dirname)))) (let ((fix-list (list (uniquify-make-item base dirname newbuf nil))) items) @@ -268,10 +283,11 @@ uniquify-buffer-file-name (if (memq major-mode uniquify-list-buffers-directory-modes) list-buffers-directory)))) (when filename - (directory-file-name - (file-name-directory - (expand-file-name - (directory-file-name filename)))))))) + (funcall uniquify-dirname-transform + (directory-file-name + (file-name-directory + (expand-file-name + (directory-file-name filename))))))))) (defun uniquify-rerationalize-w/o-cb (fix-list) "Re-rationalize the buffers in FIX-LIST, but ignoring `current-buffer'." diff --git a/test/lisp/uniquify-tests.el b/test/lisp/uniquify-tests.el index abd61fa3504..e533c4b644c 100644 --- a/test/lisp/uniquify-tests.el +++ b/test/lisp/uniquify-tests.el @@ -88,6 +88,21 @@ uniquify-dirs '("a/dir/" "b/dir/"))) (mapc #'kill-buffer bufs))))) +(ert-deftest uniquify-home () + "uniquify works, albeit confusingly, in the presence of directories named \"~\"" + (let (bufs) + (save-excursion + (push (find-file-noselect "~") bufs) + (push (find-file-noselect "./~") bufs) + (should (equal (mapcar #'buffer-name bufs) + '("~" "~<>"))) + (push (find-file-noselect "~/foo") bufs) + (push (find-file-noselect "./~/foo") bufs) + (should (equal (mapcar #'buffer-name bufs) + '("foo<~>" "foo" "~" "~<>"))) + (while bufs + (kill-buffer (pop bufs)))))) + (ert-deftest uniquify-rename-to-dir () "Giving a buffer a name which matches a directory doesn't rename the buffer" (let ((uniquify-buffer-name-style 'forward) @@ -125,5 +140,23 @@ uniquify-space-prefix (should (equal (buffer-name) "| foo")) (kill-buffer))) +(require 'project) +(ert-deftest uniquify-project-transform () + "`project-uniquify-dirname-transform' works" + (let ((uniquify-dirname-transform #'project-uniquify-dirname-transform) + (project-vc-name "foo1/bar") + bufs) + (save-excursion + (should (file-exists-p "../README")) + (push (find-file-noselect "../README") bufs) + (push (find-file-noselect "other/README") bufs) + (should (equal (mapcar #'buffer-name bufs) + '("README" "README"))) + (push (find-file-noselect "foo2/bar/README") bufs) + (should (equal (mapcar #'buffer-name bufs) + '("README" "README" "README"))) + (while bufs + (kill-buffer (pop bufs)))))) + (provide 'uniquify-tests) ;;; uniquify-tests.el ends here -- 2.41.0 --=-=-=--