Merge from origin/emacs-26

b0369d0536 Import the latest IVD_Sequences.txt
cd53b6399b Fix dired-do-compress when tar doesn't default to stdin (B...
51911dae14 Suppress warnings during elisp completion macroexpansion
a36a090a95 * lisp/progmodes/verilog-mode.el (verilog-mode): Fix typo ...
6a6e8e6e8d Make tramp-interrupt-process more robust
5bcd468a9e Make quail-input-method work when inhibit-read-only is non...
87baf1242e Fix 'fontset-name-p'
d23158777d Fix fontset documentation inconsistencies for bug#29630
a829cb8c8b Remove sentence from child frames section in Elisp manual
ad491c80e4 Avoid crashes in 'font-at' after 'set-fontset-font'
c73d2cdfd7 * lisp/files-x.el (connection-local-set-profile-variables)...
cefca2b8ac Add /etc/ssl/cert.pem to gnutls-trustfiles for macOS
122e7264b8 Fix tool-tip display when display margins are non-zero by ...
e1cc2037a9 Handle hash tables and vectors when reading/writing EIEIO ...
cda219c3df Improve interactive debugging commands in xdisp.c
1056b3cbcd Fix calculation of continuation_pixel_width in display engine
90e20804f5 Improve documentation of 'save-abbrevs'.
14f0230a48 Improve documentation of Dired
161b0e5493 * lisp/bookmark.el (bookmark-alist): Doc fix.  (Bug#29551)

4 files changed, 12 insertions, 10 deletions

diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 5f400a2399a..4e2e92c776b 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -315,7 +315,8 @@ batch mode.  @xref{Initial Options}, for a description of batch mode.)
 any of them, whenever it offers to save all files (for @kbd{C-x s} or
 @kbd{C-x C-c}).  It saves them in the file specified by
 @code{abbrev-file-name}.  This feature can be inhibited by setting the
-variable @code{save-abbrevs} to @code{nil}.
+variable @code{save-abbrevs} to @code{nil}; setting it to
+@code{silently} will save the abbrevs automatically without asking.
 
 @findex insert-abbrevs
 @findex define-abbrevs
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 9348ef5042d..6a83f42b82e 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -14,8 +14,9 @@ optionally some of its subdirectories as well.  You can use the normal
 Emacs commands to move around in this buffer, and special Dired
 commands to operate on the listed files.
 
-    The Dired buffer is read-only, and inserting text in it is not
-allowed.  Ordinary printing characters such as @kbd{d} and @kbd{x} are
+  The Dired buffer is normally read-only, and inserting text in it is
+not allowed (however, the Wdired mode allows that, @pxref{Wdired}).
+Ordinary printing characters such as @kbd{d} and @kbd{x} are
 redefined for special Dired commands.  Some Dired commands @dfn{mark}
 or @dfn{flag} the @dfn{current file} (that is, the file on the current
 line); other commands operate on the marked files or on the flagged
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index a505639f514..7af8d9efb7c 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2241,10 +2241,10 @@ attribute is ignored.
 
 @table @code
 @item :family
-Font family or fontset (a string).  @xref{Fonts,,, emacs, The GNU
+Font family name (a string).  @xref{Fonts,,, emacs, The GNU
 Emacs Manual}, for more information about font families.  The function
 @code{font-family-list} (see below) returns a list of available family
-names.  @xref{Fontsets}, for information about fontsets.
+names.
 
 @item :foundry
 The name of the @dfn{font foundry} for the font family specified by
@@ -2404,9 +2404,10 @@ Normally you do not need to set the stipple attribute, because it is
 used automatically to handle certain shades of gray.
 
 @item :font
-The font used to display the face.  Its value should be a font object.
-@xref{Low-Level Font}, for information about font objects, font specs,
-and font entities.
+The font used to display the face.  Its value should be a font object
+or a fontset.  @xref{Low-Level Font}, for information about font
+objects, font specs, and font entities.  @xref{Fontsets}, for
+information about fontsets.
 
 When specifying this attribute using @code{set-face-attribute}
 (@pxref{Attribute Functions}), you may also supply a font spec, a font
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index a146061c771..ec75361ace3 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -3121,8 +3121,7 @@ while still being visible themselves.
 their descendants as well, keeping their relative positions unaltered.
 Note that the hook @code{move-frame-functions} (@pxref{Frame Position})
 is run for a child frame only when the position of the child frame
-relative to its parent frame changes.  It is not run for a child frame
-when the position of the parent frame changes.
+relative to its parent frame changes.
 
   When a parent frame is resized, its child frames conceptually retain
 their previous sizes and their positions relative to the left upper