[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/package-vc-fixes 7e15f35bac 19/48: Avoid using 'package-lisp-dir
From: |
Philip Kaludercic |
Subject: |
scratch/package-vc-fixes 7e15f35bac 19/48: Avoid using 'package-lisp-dir' in 'package-generate-autoloads' |
Date: |
Wed, 16 Nov 2022 04:50:00 -0500 (EST) |
branch: scratch/package-vc-fixes
commit 7e15f35bac0164c9300e6c0ccfdd3bc556fec1b2
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
Avoid using 'package-lisp-dir' in 'package-generate-autoloads'
* lisp/emacs-lisp/package.el (package-generate-autoloads): Use PKG-DIR
instead of the directory contained in PKG-DESC, which might still be nil.
---
lisp/emacs-lisp/package.el | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index bf6849af65..5e5db3e2c4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1095,12 +1095,14 @@ untar into a directory named DIR; otherwise, signal an
error."
(auto-name (format "%s-autoloads.el" name))
;;(ignore-name (concat name "-pkg.el"))
(output-file (expand-file-name auto-name pkg-dir))
+ (extras (package-desc-extras pkg-desc))
+ (lisp-dir (alist-get :lisp-dir extras))
;; We don't need 'em, and this makes the output reproducible.
(autoload-timestamps nil)
(backup-inhibited t)
(version-control 'never))
(loaddefs-generate
- (package-lisp-dir pkg-desc)
+ (file-name-concat pkg-dir lisp-dir)
output-file nil
(prin1-to-string
`(add-to-list
@@ -1108,14 +1110,13 @@ untar into a directory named DIR; otherwise, signal an
error."
;; 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.
- ,(if-let ((base '(or (and load-file-name (file-name-directory
load-file-name))
- (car load-path)))
- (extras (package-desc-extras pkg-desc))
- (lisp-dir (alist-get :lisp-dir extras)))
- ;; In case the package specification indicates that the lisp
- ;; files are found in a subdirectory, append that directory.
- `(expand-file-name ,lisp-dir ,base)
- base))))
+ ,(let ((base '(or (and load-file-name (file-name-directory
load-file-name))
+ (car load-path))))
+ (if lisp-dir
+ ;; In case the package specification indicates that the lisp
+ ;; files are found in a subdirectory, append that directory.
+ `(expand-file-name ,lisp-dir ,base)
+ base)))))
(let ((buf (find-buffer-visiting output-file)))
(when buf (kill-buffer buf)))
auto-name))
- scratch/package-vc-fixes 6b35279259 45/48: Fix issues related to 'package-vc-install-from-checkout', (continued)
- scratch/package-vc-fixes 6b35279259 45/48: Fix issues related to 'package-vc-install-from-checkout', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes c383864f96 46/48: Have 'package-delete' handle symlinked packages correctly, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 7815894592 11/48: Remove references to internal symbols from public docstrings, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 2121ef0899 12/48: Fix generation of documentation for source packages, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4b30679030 15/48: Explain what "refreshing" a source package means, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes aab49e7baa 35/48: * lisp/emacs-lisp/package.el (package-lisp-dir): Fix return value, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes aeb386007b 04/48: Mark 'package-vc-install-selected-packages' as interactive, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 32310b69ab 01/48: ; Fix interactive spec for 'package-vc-refresh', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes bea359d186 05/48: Autoload 'package-vc-install-selected-packages', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes d051b24c3c 09/48: Clarify 'package-vc--build-documentation' docstring, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 7e15f35bac 19/48: Avoid using 'package-lisp-dir' in 'package-generate-autoloads',
Philip Kaludercic <=
- scratch/package-vc-fixes 315a61bbc7 18/48: Remove unused variable in 'package-vc--unpack', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes ff90ad5277 24/48: Fix indefinite loading of asynchronous downloads, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 92730e0a5e 25/48: Clarify 'package-vc-selected-packages' docstring, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4b47dc81d6 37/48: Add missing elpa-package.eld to package test resources, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 9ca8236a03 33/48: * lisp/vc/vc.el (vc-default-last-change): Use 'vc-call', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 42b01caac1 39/48: Avoid updating non-source packages in 'package-vc-update-all', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes bef3acf0f0 31/48: Explain that 'package-vc-install' doesn't remove tarball packages, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 58e2e8cced 44/48: ; * lisp/emacs-lisp/package-vc.el: Update TODO, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 2e007c62f3 14/48: Track 'default-directory' while updating source packages, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 3046447102 22/48: ; Assert that 'package-lisp-dir' is used with real packages, Philip Kaludercic, 2022/11/16