aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Kaludercic2022-11-27 15:31:29 +0100
committerPhilip Kaludercic2022-11-27 15:32:00 +0100
commitca42ff5f0ee757f0a70f603863c83e85eef683b9 (patch)
tree4f9e56225a182b081337671f428abad90d0ab7b0
parent31cfd6d3116d18c2c5b031369aeba0170d4920de (diff)
downloademacs-ca42ff5f0ee757f0a70f603863c83e85eef683b9.tar.gz
emacs-ca42ff5f0ee757f0a70f603863c83e85eef683b9.zip
Consistently refer to VC packages as such
* lisp/emacs-lisp/package-vc.el: Replace instances of "source package" in comments and docstrings. * lisp/emacs-lisp/package.el: Replace instances of "source package" in comments and docstrings.
-rw-r--r--lisp/emacs-lisp/package-vc.el20
-rw-r--r--lisp/emacs-lisp/package.el4
2 files changed, 12 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index deb0debab4d..a4520ab800f 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -284,7 +284,7 @@ asynchronously."
284 finally return "unknown")) 284 finally return "unknown"))
285 285
286(defun package-vc--version (pkg) 286(defun package-vc--version (pkg)
287 "Return the version number for the source package PKG." 287 "Return the version number for the VC package PKG."
288 (cl-assert (package-vc-p pkg)) 288 (cl-assert (package-vc-p pkg))
289 (if-let ((main-file (package-vc--main-file pkg))) 289 (if-let ((main-file (package-vc--main-file pkg)))
290 (with-temp-buffer 290 (with-temp-buffer
@@ -387,7 +387,7 @@ otherwise it's assumed to be an Info file."
387 "Prepare PKG-DESC that is already checked-out in PKG-DIR. 387 "Prepare PKG-DESC that is already checked-out in PKG-DIR.
388This includes downloading missing dependencies, generating 388This includes downloading missing dependencies, generating
389autoloads, generating a package description file (used to 389autoloads, generating a package description file (used to
390identify a package as a source package later on), building 390identify a package as a VC package later on), building
391documentation and marking the package as installed." 391documentation and marking the package as installed."
392 ;; Remove any previous instance of PKG-DESC from `package-alist' 392 ;; Remove any previous instance of PKG-DESC from `package-alist'
393 (let ((pkgs (assq (package-desc-name pkg-desc) package-alist))) 393 (let ((pkgs (assq (package-desc-name pkg-desc) package-alist)))
@@ -467,7 +467,7 @@ documentation and marking the package as installed."
467 467
468 ;; Confirm that the installation was successful 468 ;; Confirm that the installation was successful
469 (let ((main-file (package-vc--main-file pkg-desc))) 469 (let ((main-file (package-vc--main-file pkg-desc)))
470 (message "Source package `%s' installed (Version %s, Revision %S)." 470 (message "VC package `%s' installed (Version %s, Revision %S)."
471 (package-desc-name pkg-desc) 471 (package-desc-name pkg-desc)
472 (lm-with-file main-file 472 (lm-with-file main-file
473 (package-strip-rcs-id 473 (package-strip-rcs-id
@@ -534,11 +534,11 @@ checkout. This overrides the `:branch' attribute in PKG-SPEC."
534 (package-vc--unpack-1 pkg-desc pkg-dir))) 534 (package-vc--unpack-1 pkg-desc pkg-dir)))
535 535
536(defun package-vc--read-package-name (prompt &optional allow-url installed) 536(defun package-vc--read-package-name (prompt &optional allow-url installed)
537 "Query the user for a source package and return a name with PROMPT. 537 "Query the user for a VC package and return a name with PROMPT.
538If the optional argument ALLOW-URL is non-nil, the user is also 538If the optional argument ALLOW-URL is non-nil, the user is also
539allowed to specify a non-package name. If the optional argument 539allowed to specify a non-package name. If the optional argument
540INSTALLED is non-nil, the selection will be filtered down to 540INSTALLED is non-nil, the selection will be filtered down to
541source packages that have already been installed." 541VC packages that have already been installed."
542 (package-vc--archives-initialize) 542 (package-vc--archives-initialize)
543 (completing-read prompt (if installed package-alist package-archive-contents) 543 (completing-read prompt (if installed package-alist package-archive-contents)
544 (if installed 544 (if installed
@@ -554,9 +554,9 @@ source packages that have already been installed."
554 (not allow-url))) 554 (not allow-url)))
555 555
556(defun package-vc--read-package-desc (prompt &optional installed) 556(defun package-vc--read-package-desc (prompt &optional installed)
557 "Query the user for a source package and return a description with PROMPT. 557 "Query the user for a VC package and return a description with PROMPT.
558If the optional argument INSTALLED is non-nil, the selection will 558If the optional argument INSTALLED is non-nil, the selection will
559be filtered down to source packages that have already been 559be filtered down to VC packages that have already been
560installed, and the package description will be that of an 560installed, and the package description will be that of an
561installed package." 561installed package."
562 (cadr (assoc (package-vc--read-package-name prompt nil installed) 562 (cadr (assoc (package-vc--read-package-name prompt nil installed)
@@ -576,7 +576,7 @@ installed package."
576;;;###autoload 576;;;###autoload
577(defun package-vc-update (pkg-desc) 577(defun package-vc-update (pkg-desc)
578 "Attempt to update the package PKG-DESC." 578 "Attempt to update the package PKG-DESC."
579 (interactive (list (package-vc--read-package-desc "Update source package: " t))) 579 (interactive (list (package-vc--read-package-desc "Update VC package: " t)))
580 ;; HACK: To run `package-vc--unpack-1' after checking out the new 580 ;; HACK: To run `package-vc--unpack-1' after checking out the new
581 ;; revision, we insert a hook into `vc-post-command-functions', and 581 ;; revision, we insert a hook into `vc-post-command-functions', and
582 ;; remove it right after it ran. To avoid running the hook multiple 582 ;; remove it right after it ran. To avoid running the hook multiple
@@ -660,8 +660,8 @@ Optional argument BACKEND specifies the VC backend to use for cloning
660the package's repository; this is only possible if NAME-OR-URL is a URL, 660the package's repository; this is only possible if NAME-OR-URL is a URL,
661a string. If BACKEND is omitted or nil, the function 661a string. If BACKEND is omitted or nil, the function
662uses `package-vc-heuristic-alist' to guess the backend. 662uses `package-vc-heuristic-alist' to guess the backend.
663Note that by default, a source package will be prioritized over a 663Note that by default, a VC package will be prioritized over a
664regular package, but it will not remove a source package." 664regular package, but it will not remove a VC package."
665 (interactive 665 (interactive
666 (progn 666 (progn
667 ;; Initialize the package system to get the list of package 667 ;; Initialize the package system to get the list of package
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e11c5d693e5..8d44fae30a0 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -458,7 +458,7 @@ synchronously."
458(defvar package--default-summary "No description available.") 458(defvar package--default-summary "No description available.")
459 459
460(define-inline package-vc-p (pkg-desc) 460(define-inline package-vc-p (pkg-desc)
461 "Return non-nil if PKG-DESC is a source package." 461 "Return non-nil if PKG-DESC is a VC package."
462 (inline-letevals (pkg-desc) 462 (inline-letevals (pkg-desc)
463 (inline-quote (eq (package-desc-kind ,pkg-desc) 'vc)))) 463 (inline-quote (eq (package-desc-kind ,pkg-desc) 'vc))))
464 464
@@ -909,7 +909,7 @@ correspond to previously loaded files."
909 (let ((v1 (package-desc-version p1)) 909 (let ((v1 (package-desc-version p1))
910 (v2 (package-desc-version p2))) 910 (v2 (package-desc-version p2)))
911 (or 911 (or
912 ;; Prefer source packages. 912 ;; Prefer VC packages.
913 (package-vc-p p1) 913 (package-vc-p p1)
914 (package-vc-p p2) 914 (package-vc-p p2)
915 ;; Prefer builtin packages. 915 ;; Prefer builtin packages.