Merge from origin/emacs-27

ad5e350ab7 c-end-of-macro: Handle block coment lines with unescaped N...
06c302d425 Fix set-fontset-font with ADD arg non-nil
530067463b Correct "different than" to "different from" where appropr...
56b8768b32 More accurate documentation of 'package-menu-hide-package'

6 files changed, 12 insertions, 9 deletions

diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index 360fc980e4a..db3cf317ff1 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -154,8 +154,11 @@ redisplays the package list.
 @item H
 @kindex H @r{(Package Menu)}
 @findex package-menu-hide-package
-Permanently hide packages that match a regexp
-(@code{package-menu-hide-package}).
+Hide packages whose names match a regexp
+(@code{package-menu-hide-package}).  This prompts for a regexp, and
+then hides the packages with matching names.  The default value of the
+regexp will hide only the package whose name is at point, so just
+pressing @key{RET} to the prompt will hide the current package.
 
 @item (
 @kindex ( @r{(Package Menu)}
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 773bb939441..5c5a5da5511 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -167,7 +167,7 @@ what is going on in the current buffer.  When there is only one
 window, the mode line appears right above the echo area; it is the
 next-to-last line in the frame.  On a graphical display, the mode line
 is drawn with a 3D box appearance.  Emacs also usually draws the mode
-line of the selected window with a different color than that of
+line of the selected window with a different color from that of
 unselected windows, in order to make it stand out.
 
   The text displayed in the mode line has the following format:
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index a6f4b6829f1..9834952566f 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -12919,7 +12919,7 @@ familiar part of this function.
 @unnumberedsubsec The @code{let*} expression
 
 The next line of the @code{forward-paragraph} function begins a
-@code{let*} expression.  This is a different than @code{let}.  The
+@code{let*} expression.  This is different from @code{let}.  The
 symbol is @code{let*} not @code{let}.
 
 @findex let*
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index a31f232089b..1dab29b8a5a 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -27155,7 +27155,7 @@ anywhere in the formula.
 It is possible for a rule set to get into an infinite loop.  The
 most obvious case, replacing a formula with itself, is not a problem
 because a rule is not considered to ``succeed'' unless the righthand
-side actually comes out to something different than the original
+side actually comes out to something different from the original
 formula or sub-formula that was matched.  But if you accidentally
 had both @samp{ln(a b) := ln(a) + ln(b)} and the reverse
 @samp{ln(a) + ln(b) := ln(a b)} in your rule set, Calc would
@@ -28075,7 +28075,7 @@ for angstroms.
 
 The unit @code{pt} stands for pints; the name @code{point} stands for
 a typographical point, defined by @samp{72 point = 1 in}.  This is
-slightly different than the point defined by the American Typefounder's
+slightly different from the point defined by the American Typefounder's
 Association in 1886, but the point used by Calc has become standard
 largely due to its use by the PostScript page description language.
 There is also @code{texpt}, which stands for a printer's point as
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 2545d21863a..b5eb81b787e 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -27658,7 +27658,7 @@ added.  A plethora of new commands and modes have been added.
 @xref{Gnus Unplugged}, for the full story.
 
 @item
-The @code{nndraft} back end has returned, but works differently than
+The @code{nndraft} back end has returned, but works differently from
 before.  All Message buffers are now also articles in the @code{nndraft}
 group, which is created automatically.
 
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index abde85c790b..ccf5b9efb05 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -1033,7 +1033,7 @@ that will be used to composed a non-nested citation string.  Supercite
 scans the various mail headers present in the original article and uses
 a number of heuristics to extract strings which it puts into the
 @dfn{attribution association list} or @dfn{attribution alist}.  This is
-analogous, but different than, the info alist previously mentioned.  Each
+analogous, but different from, the info alist previously mentioned.  Each
 element in the attribution alist is a key-value pair containing such
 information as the author's first name, middle names, and last name, the
 author's initials, and the author's email terminus.
@@ -1330,7 +1330,7 @@ co-worker that uses an uncommon citation style (say one that employs a
 possible for Supercite to recognize this and @emph{coerce} the citation
 to your preferred style, for consistency.  In theory, it is possible for
 Supercite to recognize such things as uuencoded messages or C code and
-cite or fill those differently than normal text.  None of this is
+cite or fill those differently from normal text.  None of this is
 currently part of Supercite, but contributions are welcome!
 
 @node  Using Regi