aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/emacs-lisp/package-vc.el17
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 88304c49675..9780e4d53de 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -953,18 +953,19 @@ for the last released version of the package."
953 (find-file directory))) 953 (find-file directory)))
954 954
955;;;###autoload 955;;;###autoload
956(defun package-vc-install-from-checkout (dir name) 956(defun package-vc-install-from-checkout (dir &optional name)
957 "Install the package NAME from its source directory DIR. 957 "Install the package NAME from its source directory DIR.
958NAME defaults to the base name of DIR.
958Interactively, prompt the user for DIR, which should be a directory 959Interactively, prompt the user for DIR, which should be a directory
959under version control, typically one created by `package-vc-checkout'. 960under version control, typically one created by `package-vc-checkout'.
960If invoked interactively with a prefix argument, prompt the user 961If invoked interactively with a prefix argument, prompt the user
961for the NAME of the package to set up. Otherwise infer the package 962for the NAME of the package to set up."
962name from the base name of DIR." 963 (interactive (let* ((dir (read-directory-name "Directory: "))
963 (interactive (let ((dir (read-directory-name "Directory: "))) 964 (base (file-name-base (directory-file-name dir))))
964 (list dir 965 (list dir (and current-prefix-arg
965 (if current-prefix-arg 966 (read-string
966 (read-string "Package name: ") 967 (format-prompt "Package name" base)
967 (file-name-base (directory-file-name dir)))))) 968 nil nil base)))))
968 (unless (vc-responsible-backend dir) 969 (unless (vc-responsible-backend dir)
969 (user-error "Directory %S is not under version control" dir)) 970 (user-error "Directory %S is not under version control" dir))
970 (package-vc--archives-initialize) 971 (package-vc--archives-initialize)