procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-29

Browse source 
f4f30ff4c4 Update to Org 9.6.1
09f7a92064 Add support for annotation_type_declaration
4a8891a462 * etc/NEWS: Mention incompatible changes in 'outline-mino...
384504edf3 Ensure VC package names are not empty
70947da708 Handle missing package description when unpacking vc pack...

# Conflicts:
#	etc/NEWS
This commit is contained in:
Stefan Kangas 2023-01-12 06:30:12 +01:00
commit e2abb95b6b
7 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/emacs-lisp/package-vc.el
View file

@ -600,10 +600,14 @@ PKG-SPEC is a package specification, a property list describing
how to fetch and build the package. See `package-vc--archive-spec-alist'
for details. The optional argument REV specifies a specific revision to
checkout. This overrides the `:branch' attribute in PKG-SPEC."
(unless pkg-desc
(package-desc-create :name (car pkg-spec) :kind 'vc))
(pcase-let* (((map :lisp-dir) pkg-spec)
(name (package-desc-name pkg-desc))
(dirname (package-desc-full-name pkg-desc))
(pkg-dir (expand-file-name dirname package-user-dir)))
(when (string-empty-p name)
(user-error "Empty package name"))
(setf (package-desc-dir pkg-desc) pkg-dir)
(when (file-exists-p pkg-dir)
(if (yes-or-no-p (format "Overwrite previous checkout for package `%s'?" name))
@ -771,7 +775,9 @@ regular package, but it will not remove a VC package.
(package-vc--archives-initialize)
(let* ((name-or-url (package-vc--read-package-name
"Fetch and install package: " t))
(name (file-name-base name-or-url)))
(name (file-name-base (directory-file-name name-or-url))))
(when (string-empty-p name)
(user-error "Empty package name"))
(list name-or-url
(and current-prefix-arg :last-release)
nil