scratch/package-vc-fixes 9a5ee996ff 1/3: Remove 'package-lisp-dir'

[Philip Kaludercic]

branch: scratch/package-vc-fixes
commit 9a5ee996ff9f5f12e9e3a87bc281f683bfe81abf
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Remove 'package-lisp-dir'
    
    * lisp/emacs-lisp/package.el (package-lisp-dir): Remove function.
    (package--reload-previously-loaded): Revert to 'package-desc-dir'.
    (package-activate-1): Revert to 'package-desc-dir'.
    (package--compile): Revert to 'package-desc-dir'.
    (package--native-compile-async): Revert to 'package-desc-dir'.
    (package-recompile): Revert to 'package-desc-dir'.
---
 lisp/emacs-lisp/package.el | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f3d26ebeda..cae0531e4d 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -462,16 +462,6 @@ synchronously."
   (inline-letevals (pkg-desc)
     (inline-quote (eq (package-desc-kind ,pkg-desc) 'vc))))
 
-(define-inline package-lisp-dir (pkg-desc)
-  "Return the directory with Lisp files for PKG-DESC."
-  (inline-letevals (pkg-desc)
-    (inline-quote
-     (let* ((extras (package-desc-extras ,pkg-desc))
-            (lisp-dir (alist-get :lisp-dir extras))
-            (dir (package-desc-dir ,pkg-desc)))
-       (cl-assert dir)
-       (file-name-as-directory (file-name-concat dir lisp-dir))))))
-
 (cl-defstruct (package-desc
                ;; Rename the default constructor from `make-package-desc'.
                (:constructor package-desc-create)
@@ -837,7 +827,7 @@ redefinitions, the overlooking of which would cause
 byte-compilation of the new package to fail."
   (with-demoted-errors "Error in package--load-files-for-activation: %s"
     (let* (result
-           (dir (package-lisp-dir pkg-desc))
+           (dir (package-desc-dir pkg-desc))
            ;; A previous implementation would skip `dir' itself.
            ;; However, in normal use reloading from the same directory
            ;; never happens anyway, while in certain cases external to
@@ -901,7 +891,7 @@ correspond to previously loaded files."
           (package--reload-previously-loaded pkg-desc))
         (with-demoted-errors "Error loading autoloads: %s"
           (load (package--autoloads-file-name pkg-desc) nil t))
-        (add-to-list 'load-path (package-lisp-dir pkg-desc)))
+        (add-to-list 'load-path (directory-file-name pkg-dir)))
       ;; Add info node.
       (when (file-exists-p (expand-file-name "dir" pkg-dir))
         ;; FIXME: not the friendliest, but simple.
@@ -1142,7 +1132,7 @@ This assumes that `pkg-desc' has already been activated 
with
   (let ((byte-compile-ignore-files (package--parse-elpaignore pkg-desc))
         (warning-minimum-level :error)
         (load-path load-path))
-    (byte-recompile-directory (package-lisp-dir pkg-desc) 0 t)))
+    (byte-recompile-directory (package-desc-dir pkg-desc) 0 t)))
 
 (defun package--native-compile-async (pkg-desc)
   "Native compile installed package PKG-DESC asynchronously.
@@ -1150,7 +1140,7 @@ This assumes that `pkg-desc' has already been activated 
with
 `package-activate-1'."
   (when (native-comp-available-p)
     (let ((warning-minimum-level :error))
-      (native-compile-async (package-lisp-dir pkg-desc) t))))
+      (native-compile-async (package-desc-dir pkg-desc) t))))
 
 ;;;; Inferring package from current buffer
 (defun package-read-from-string (str)
@@ -2561,7 +2551,7 @@ object."
     ;; load them (in case they contain byte code/macros that are now
     ;; invalid).
     (dolist (elc (directory-files-recursively
-                  (package-lisp-dir pkg-desc) "\\.elc\\'"))
+                  (package-desc-dir pkg-desc) "\\.elc\\'"))
       (delete-file elc))
     (package--compile pkg-desc)))