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

Merge from origin/emacs-29

Browse source 
212e30f678 ; Fix byte-compilation warnings in c-ts-mode.el
1f2214dabd Skip over whitespace in annotation-top-cont check (bug#63...
7e136c51f6 Update zh-CN tutorial translation
d3ca0b3aa2 ; * lisp/progmodes/c-ts-mode.el: Fix comments and doc str...
c6f15c2486 ; Fix last change.
b9e06330f7 ; * etc/NEWS: Followup to bug#62720.
b33d25f596 ; Minor improvements in doc strings of package-upgrade co...
c3a61870b9 Fix eglot.texi

# Conflicts:
#	etc/NEWS
This commit is contained in:
Eli Zaretskii 2023-04-28 12:14:26 -04:00
commit e155df7da7
7 changed files with 146 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/emacs-lisp/package.el
View file

@ -2266,8 +2266,9 @@ had been enabled."
"Upgrade package NAME if a newer version exists.
Currently, packages which are part of the Emacs distribution
cannot be upgraded that way. Use `i' after `M-x list-packages' to
upgrade to an ELPA version first."
cannot be upgraded that way. To enable upgrades of such a
package using this command, first upgrade the package to a
newer version from ELPA by using `\\<package-menu-mode-map>\\[package-menu-mark-install]' after `\\[list-packages]'."
(interactive
(list (completing-read
"Upgrade package: " (package--upgradeable-packages) nil t)))
@ -2304,7 +2305,11 @@ If QUERY, ask the user before upgrading packages. When called
interactively, QUERY is always true.
Currently, packages which are part of the Emacs distribution are
not upgraded that way. Use `i' after `M-x list-packages' to
not upgraded by this command. To enable upgrading such a package
using this command, first upgrade the package to a newer version
from ELPA by using `\\<package-menu-mode-map>\\[package-menu-mark-install]' after `\\[list-packages]'.
Use `i' after `M-x list-packages' to
upgrade to an ELPA version first."
(interactive (list (not noninteractive)))
(package-refresh-contents)