From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: feature/package-vc has been merged Date: Wed, 09 Nov 2022 18:00:37 +0000 Message-ID: <87educ9fei.fsf@posteo.net> References: <164484721900.31751.1453162457552427931@vcs2.savannah.gnu.org> <87fsewp0ec.fsf@posteo.net> <837d0814c9.fsf@gnu.org> <878rkooz1o.fsf@posteo.net> <831qqg1306.fsf@gnu.org> <874jvcowzm.fsf@posteo.net> <83y1soypvx.fsf@gnu.org> <87y1song5x.fsf@posteo.net> <83v8nsyof7.fsf@gnu.org> <87leoond7l.fsf@posteo.net> <83r0yfzz01.fsf@gnu.org> <87bkpjyx3p.fsf@posteo.net> <83bkpjynmj.fsf@gnu.org> <87iljqya44.fsf@posteo.net> <8335auzo9s.fsf@gnu.org> <87zgd2ws8z.fsf@posteo.net> <831qqezkxj.fsf@gnu.org> <87y1slgq3m.fsf@posteo.net> <87bkpgfsqv.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11067"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , rms@gnu.org, emacs-devel@gnu.org, Lars Ingebrigtsen To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 09 19:01:29 2022 Return-path: Envelope-to: ged-emacs-devel@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 1ospOC-0002i5-JA for ged-emacs-devel@m.gmane-mx.org; Wed, 09 Nov 2022 19:01:28 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ospNT-00039W-K5; Wed, 09 Nov 2022 13:00:43 -0500 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 1ospNS-000389-4n for emacs-devel@gnu.org; Wed, 09 Nov 2022 13:00:42 -0500 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ospNQ-0003JH-HC for emacs-devel@gnu.org; Wed, 09 Nov 2022 13:00:41 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7BCB324002A for ; Wed, 9 Nov 2022 19:00:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1668016838; bh=BWqsx9Dyiull7tn7YWWfbC+ub9n2ObhsGXXL6xekwII=; h=From:To:Cc:Subject:Date:From; b=kvvnCWpYuoEon2Vxy1FvjPfdDxDf/e9g2lW7K2SBjB6cq1a0TBZn5P2/DaFmeBfCC kxqs0AIQdBjb4inITgzqNW0UaIvEX8S0OcYRia6Z6B8cTFUqWTh3L2aZjn6TllFm8A RzCVzBJVhIutZ5vOesy7YFaRpbWd6eTbjgf8ntAGW+qbRWvtxwCYci9LAgoTvIbeCS q73rAPKq/BIcJ/N8rAozqrJNJ1IQgmMAIXdhu69Hj6sC1DWWzxNqqXXwUK2Hkbdoru kNSDeKOhqIVfqcyCojLEWvrI0G8HB/N44TMH6Szfg6tUhGo8YIoPuDZW5L/EDXZb3u 7AfL5G+FbqtPw== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4N6t6s2cZJz6tmQ; Wed, 9 Nov 2022 19:00:37 +0100 (CET) In-Reply-To: (Stefan Monnier's message of "Wed, 09 Nov 2022 12:49:20 -0500") Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:299421 Archived-At: Stefan Monnier writes: >> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el >> index 0881626e92..67ce30a93c 100644 >> --- a/lisp/emacs-lisp/package.el >> +++ b/lisp/emacs-lisp/package.el >> @@ -1103,8 +1103,17 @@ package-generate-autoloads >> (package-lisp-dir pkg-desc) >> output-file nil >> (prin1-to-string >> - `(add-to-list 'load-path >> - ,(package-lisp-dir pkg-desc)))) >> + `(add-to-list >> + 'load-path >> + (file-name-concat >> + ;; Add the directory that will contain the autoload file to >> + ;; the load path. We don't hard-code `pkg-dir', to avoid >> + ;; issues if the package directory is moved around. >> + (or (and load-file-name (file-name-directory load-file-name)) >> + (car load-path)) >> + ;; In case the package specification indicates that the lisp >> + ;; files are found in a subdirectory, append that path. >> + ,(alist-get :lisp-dir (package-desc-extras pkg-desc)))))) >> (let ((buf (find-buffer-visiting output-file))) >> (when buf (kill-buffer buf))) >> auto-name)) > > I don't understand why we have code relating to `package-vc` in > `package.el`. I have made :lisp-dir a general property of a package description. This might be set in package-vc when generating the -pkg.el, but in principle any (non-vc) package could make use of this to indicate a subdirectory where lisp files are stored. For now this is something that will probably only interest package-vc. > Please be careful to try to correctly preserve the *exact* name added to > `load-path` (most importantly whether it ends in a slash or not), > because some other code relies on it (e.g. to try and avoid having both > `/foo/bar` and `/foo/bar/` or to remove entries). Good point, I'll make sure to check that.