diff options
author | Eli Zaretskii <eliz@gnu.org> | 2025-01-11 07:44:23 -0500 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2025-01-11 07:44:23 -0500 |
commit | 3d960c16c60da14a07da538cc2468f46425df634 (patch) | |
tree | 05eecbbec1a8b784e877790abe4716f0adb602ad /lisp/emacs-lisp/package.el | |
parent | 5060bf6ed64a6e96b4c660e6ad5204a23133b71d (diff) | |
parent | d66b8d4becb6804d3bd912a000dc64ccfdbe6810 (diff) | |
download | emacs-3d960c16c60da14a07da538cc2468f46425df634.tar.gz emacs-3d960c16c60da14a07da538cc2468f46425df634.tar.bz2 emacs-3d960c16c60da14a07da538cc2468f46425df634.zip |
Merge from origin/emacs-30
d66b8d4becb Fix checkbox's child creation
26c5fadf474 Document that 'package-vc' doesn't support built-in packages
ee61b9a050b ; Fix documentation of completion commands
ce43d13593a ; Simplify admin/run-codespell
fa1470d0699 ; Remove duplicated word in files.el Commentary
dabaea97465 Improve checkdoc-common-verbs-wrong-voice docstring
6de2ee5663d Document string-as-{unibyte,multibyte} as obsolete in manual
7f76f872ebf Fix go-ts-mode var spec indentation (Bug#75362)
01464fc882d Add "text" as a thing in tsx-ts-mode
59c57337923 Improve doc string of 'package-delete'
313a191d047 ; * admin/MAINTAINERS: Remove Kelvin White.
002960ceabf Clarify that 'mac' line ending convention is not used on ...
4210e065648 Add language server for Odin
ee1034422b0 ; Improve documentation of function-type display
1c49edc4080 Modernize "Commentary" section of files.el
505c1123e18 * INSTALL: Add advice how to invoke 'make install'. (Bug...
82e16cae9cc Improve the documentation of 'key-valid-p'
# Conflicts:
# etc/NEWS
# lisp/progmodes/typescript-ts-mode.el
Diffstat (limited to 'lisp/emacs-lisp/package.el')
-rw-r--r-- | lisp/emacs-lisp/package.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 3abce17a3e8..be8dc3f8377 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2497,8 +2497,9 @@ compiled." (defun package-delete (pkg-desc &optional force nosave) "Delete package PKG-DESC. -Argument PKG-DESC is a full description of package as vector. -Interactively, prompt the user for the package name and version. +Argument PKG-DESC is the full description of the package, for example as +obtained by `package-get-descriptor'. Interactively, prompt the user +for the package name and version. When package is used elsewhere as dependency of another package, refuse deleting it and return an error. |