From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 25 May 2022 17:57:59 +0000 (-0400)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1910^2~429
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97bb31be9f4e06060f2d192b049c3cdb47aca2f5;p=emacs.git

Merge from origin/emacs-28

86b49d5865 ; * etc/NEWS: Announce changes in 'desktop-kill'.  (Bug#55...
d5ccf2621a ; Fix last change
f1c1fd7184 Improve documentation of mail-user-agent.
b05d1e9b98 ; * lisp/desktop.el: Update the commentary.  (Bug#55560)
139bfa1a08 More fixes in abbrev.el doc strings
d80dea6036 Add note about Tramp completion to completion-styles doc s...
9e7c0cf57d Remove mention of removed nnimap-nov-is-evil variable
90aae0bca2 Improve documentation strings and prompts in abbrev.el
dfa3e6f424 Restore the Fselect_window call in gui_consider_frame_title.
de35e9728f Advise against settings in the MS-Windows system registry
3ffa3d3403 ; Minor addition to make-tarball.txt
7dc026f9ea Fix kmacro-keymap binding after previous change
4f0fd54bc4 Add glossary entries for "interactively"
af1c05a3c4 Fix the name of a kmacro command.

# Conflicts:
#	etc/NEWS
#	lisp/abbrev.el
---

97bb31be9f4e06060f2d192b049c3cdb47aca2f5
diff --cc lisp/abbrev.el
index 3ee972869bc,b7216f5d633..e875d77faae
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@@ -279,10 -284,10 +283,10 @@@ abbrevs have been saved.
    (write-abbrev-file file t))
  
  (defun abbrev-edit-save-buffer ()
-   "Save all user-level abbrev definitions in current buffer.
+   "Save all the user-level abbrev definitions in current buffer.
  The saved abbrevs are written to the file specified by
  `abbrev-file-name'."
 -  (interactive)
 +  (interactive nil edit-abbrevs-mode)
    (abbrev-edit-save-to-file abbrev-file-name))
  
  
@@@ -1140,13 -1158,13 +1159,13 @@@ Properties with special meaning
    case-folding, and the expansion is not capitalized/upcased.
  - `:regexp' is a regular expression that specifies how to extract the
    name of the abbrev before point.  The submatch 1 is treated
-   as the potential name of an abbrev.  If :regexp is nil, the default
+   as the potential name of an abbrev.  If `:regexp' is nil, the default
    behavior uses `backward-word' and `forward-word' to extract the name
-   of the abbrev, which can therefore only be a single word.
- - `:enable-function' can be set to a function of no argument which returns
+   of the abbrev, which can therefore by default only be a single word.
+ - `:enable-function' can be set to a function of no arguments which returns
    non-nil if and only if the abbrevs in this table should be used for this
    instance of `expand-abbrev'."
 -  (declare (doc-string 3))
 +  (declare (doc-string 3) (indent defun))
    ;; We used to manually add the docstring, but we also want to record this
    ;; location as the definition of the variable (in load-history), so we may
    ;; as well just use `defvar'.