summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2019-07-20 22:02:36 -0400
committerNoam Postavsky <npostavs@gmail.com>2019-07-20 22:02:36 -0400
commit6490269becdad96ca4b3b9db0d96dbb04ef2ab6a (patch)
tree20cccad69113acfe3072dcf50a677b06c6d7b4fb /lisp/emacs-lisp
parentf02b9e9a6ff701d041ef86afe8b9a92ba8e4fd30 (diff)
parent150bdfe43acde8423612cbff4eafbbb88878b497 (diff)
downloademacs-6490269becdad96ca4b3b9db0d96dbb04ef2ab6a.tar.gz
emacs-6490269becdad96ca4b3b9db0d96dbb04ef2ab6a.tar.bz2
emacs-6490269becdad96ca4b3b9db0d96dbb04ef2ab6a.zip
Merge from emacs-26
150bdfe43a Handle completely undecoded input in term (Bug#29918) 021f32cca1 * doc/misc/forms.texi (Control File Format): Fix a doc error. 76538d09b7 Fix typo in package-alist docstring b2fde4b5e8 * doc/lispref/text.texi (Mode-Specific Indent): Fix a typo... 7e62778548 ; Another minor change in 'bidi-display-reordering's doc s... 4455ddbe56 Improve doc string of 'bidi-display-reordering' 34ee26dd93 Add warning to bidi-display-reordering doc string # Conflicts: # lisp/term.el # test/lisp/term-tests.el
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 9a350aadaca..53fa15d4199 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -547,8 +547,8 @@ name (a symbol) and DESC is a `package--bi-desc' structure.")
(defvar package-alist nil
"Alist of all packages available for activation.
Each element has the form (PKG . DESCS), where PKG is a package
-name (a symbol) and DESCS is a non-empty list of `package-desc' structure,
-sorted by decreasing versions.
+name (a symbol) and DESCS is a non-empty list of `package-desc'
+structures, sorted by decreasing versions.
This variable is set automatically by `package-load-descriptor',
called via `package-initialize'. To change which packages are