Merge branch 'master' of https://github.com/emacs-mirror/emacs into pgtk

Author: Yuuki Harano

ChangeLog.2

@@ -15300,7 +15300,7 @@
 
 	* lisp/progmodes/cc-langs.el (c++-template-syntax-table)
 	(c-no-parens-syntax-table): Add extra "(eval ..)"s around "'(lambda ..)"
-	forms to remove the superflous quotes.
+	forms to remove the superfluous quotes.
 
 2015-11-24  Eli Zaretskii  <[email protected]>
 

ChangeLog.3

@@ -1039,7 +1039,7 @@
 	recursively sorted with the same mechanism.  That way variables tied
 	to a particular subdirectory override those in a parent directory.
 
-	Previously the behaviour didn’t seem to be well defined anyway and was
+	Previously the behavior didn’t seem to be well defined anyway and was
 	dependent on the order they appeared in the file.  However this order
 	was changed in version 26.1 and it probably also depended on the
 	number of dir-local files that are merged.
@@ -7238,7 +7238,8 @@
 
 2018-04-17  Andreas Schwab  <[email protected]>
 
-	Fix undefined behaviour while looking for lexical-binding file variable (bug 31186)
+	Fix undefined behavior while looking for lexical-binding file
+	variable (bug 31186).
 
 	* src/lread.c (lisp_file_lexically_bound_p): Reset
 	beg_end_state before reading variable or value.
@@ -16431,7 +16432,7 @@
 	Loading flymake-elisp.el doesn't setup flymake-mode to turn on
 	automatically, but it affects emacs-lisp-mode-hook so that
 	flymake-diagnostic-functions is setup with a suitable buffer-local
-	value.  The variable flymake-diagnostic-funtions in every live
+	value.  The variable flymake-diagnostic-functions in every live
 	emacs-lisp-mode buffer is also adjusted.
 
 	* lisp/progmodes/flymake.el (top): Require flymake-elisp.
@@ -63858,7 +63859,7 @@
 
 2016-01-20  Eli Zaretskii  <[email protected]>
 
-	Anoter fix for problematic merge from emacs-25
+	Another fix for problematic merge from emacs-25
 
 	* src/w32fns.c (globals_of_w32fns): Move initialization of
 	resetstkoflw to a non-Cygwin part.
@@ -66448,8 +66449,8 @@
 	(verilog-modi-cache-results, verilog-save-buffer-state)
 	(verilog-save-font-no-change-functions): When internally suppressing change
 	functions, use `inhibit-modification-hooks' and call
-	`after-change-funtions' to more nicely work with user hooks.  Reported by
-	Stefan Monnier.
+	`after-change-functions' to more nicely work with user hooks.
+	Reported by Stefan Monnier.
 
 	(verilog-auto, verilog-delete-auto, verilog-delete-auto-buffer):
 	Create `verilog-delete-auto-buffer' to avoid double-calling

admin/nt/dist-build/build-dep-zips.py

@@ -78,7 +78,7 @@ def immediate_deps(pkg):
     ## Split into dependencies
     dependencies = dependencies.strip().split(" ")
 
-    ## Remove > signs TODO can we get any other punctation here?
+    ## Remove > signs TODO can we get any other punctuation here?
     dependencies = [d.split(">")[0] for d in dependencies if d]
     dependencies = [d for d in dependencies if not d == "None"]
 

doc/emacs/files.texi

@@ -1394,6 +1394,10 @@ backup of.  In all other respects, this behaves like @kbd{M-x diff}.
 buffer with its corresponding file.  This shows you what changes you
 would make to the file if you save the buffer.
 
+@findex diff-buffers
+  The command @kbd{M-x diff-buffers} compares the contents of two
+specified buffers.
+
 @findex compare-windows
   The command @kbd{M-x compare-windows} compares the text in the
 current window with that in the window that was the selected window

doc/emacs/macos.texi

@@ -99,7 +99,7 @@ keys and the fullscreen behavior.  To see all such options, use
 
 @subsection Modifier keys
 
-The following variables control the behaviour of the actual modifier
+The following variables control the behavior of the actual modifier
 keys:
 
 @table @code
@@ -135,12 +135,12 @@ which describes the modifier when used with ordinary keys, function keys
 If the @var{symbol} is one of @code{control}, @code{meta}, @code{alt},
 @code{super} or @code{hyper}, this describes the Emacs modifier it
 represents.  If @var{symbol} is @code{none}, Emacs does not use the
-key, which retains its standard behaviour.  For instance, the
+key, which retains its standard behavior.  For instance, the
 @key{Option} key in macOS is then used for composing additional
 characters.
 
 The variables for right-hand keys, like @code{ns-right-alternate-modifier},
-may also be set to @code{left}, which means to use the same behaviour as
+may also be set to @code{left}, which means to use the same behavior as
 the corresponding left-hand key.
 
 @subsection Font Panel
@@ -210,7 +210,7 @@ the mouse.
 
 The sending application has some limited ability to decide how Emacs
 handles the sent object, but the user may override the default
-behaviour by holding one or more modifier key.
+behavior by holding one or more modifier key.
 
 @table @kbd
 @item control
@@ -220,7 +220,7 @@ will insert the filename.
 Attempt to open the object as though it is a file or URL.
 @item super/command
 Perform the default action for the type.  This can be useful when an
-application is overriding the default behaviour.
+application is overriding the default behavior.
 @end table
 
 The modifier keys listed above are defined by macOS and are unaffected

doc/emacs/mini.texi

@@ -222,9 +222,13 @@ can also scroll the help text with @kbd{M-@key{PageUp}} and
 possible completions.  @xref{Other Window}.
 
 @vindex enable-recursive-minibuffers
+@findex minibuffer-depth-indicate-mode
   Emacs normally disallows most commands that use the minibuffer while
 the minibuffer is active.  To allow such commands in the minibuffer,
 set the variable @code{enable-recursive-minibuffers} to @code{t}.
+You might need also to enable @code{minibuffer-depth-indicate-mode}
+to show the current recursion depth in the minibuffer prompt
+on recursive use of the minibuffer.
 
 @findex minibuffer-inactive-mode
   When not active, the minibuffer is in @code{minibuffer-inactive-mode},

doc/emacs/search.texi

@@ -1199,7 +1199,7 @@ symbol-constituent character.
 matches any character whose syntax is @var{c}.  Here @var{c} is a
 character that designates a particular syntax class: thus, @samp{w}
 for word constituent, @samp{-} or @samp{ } for whitespace, @samp{.}
-for ordinary punctuation, etc.  @xref{Syntax Tables,, Syntax Tables,
+for ordinary punctuation, etc.  @xref{Syntax Class Table,, Syntax Class Table,
 elisp, The Emacs Lisp Reference Manual}.
 
 @item \S@var{c}

doc/lispintro/emacs-lisp-intro.texi

@@ -103,7 +103,7 @@
 @c number suitable for the title page, and update-date to be the date,
 @c in the preferred style for these.  E.g., run the shell command:
 @c   texi2any -D 'edition-number 3.11' \
-@c            -D 'titlepage-edition-number Revised Third Edtion' \
+@c            -D 'titlepage-edition-number Revised Third Edition' \
 @c            -D 'update-date 31 March 2020'
 @c This relates mainly to the published book sold by the FSF.
 
@@ -3832,7 +3832,7 @@ delimit them from the body of the @code{let}.
 @findex if
 @cindex Conditional with @code{if}
 
-Anoter special form is the conditional @code{if}.  This form is used
+Another special form is the conditional @code{if}.  This form is used
 to instruct the computer to make decisions.  You can write function
 definitions without using @code{if}, but it is used often enough, and
 is important enough, to be included here.  It is used, for example, in

doc/lispref/commands.texi

@@ -1788,9 +1788,10 @@ additional data because signals do not carry additional information.
 They can be useful for debugging (@pxref{Error Debugging}).
 
 To catch a user signal, bind the corresponding event to an interactive
-command in the @code{special-event-map} (@pxref{Active Keymaps}).
+command in the @code{special-event-map} (@pxref{Controlling Active Maps}).
 The command is called with no arguments, and the specific signal event is
-available in @code{last-input-event}.  For example:
+available in @code{last-input-event} (@pxref{Event Input Misc}.  For
+example:
 
 @smallexample
 (defun sigusr-handler ()
@@ -3018,7 +3019,7 @@ definition to find the actual event.
 user signals like @code{sigusr1} are normally handled in this way.
 The keymap which defines how to handle special events---and which
 events are special---is in the variable @code{special-event-map}
-(@pxref{Active Keymaps}).
+(@pxref{Controlling Active Maps}).
 
 @node Waiting
 @section Waiting for Elapsed Time or Input

doc/lispref/display.texi

@@ -276,13 +276,11 @@ followed by a newline.
 When @code{inhibit-message} is non-@code{nil}, no message will be displayed
 in the echo area, it will only be logged to @samp{*Messages*}.
 
-If the minibuffer is active, it uses the @code{minibuffer-message}
-function to display the message temporarily at the end of the
-minibuffer (@pxref{Minibuffer Misc}).
-
 If @var{format-string} is @code{nil} or the empty string,
 @code{message} clears the echo area; if the echo area has been
-expanded automatically, this brings it back to its normal size.
+expanded automatically, this brings it back to its normal size.  If
+the minibuffer is active, this brings the minibuffer contents back
+onto the screen immediately.
 
 @example
 @group
@@ -2499,9 +2497,12 @@ space between end of line and edge of the window using this face, or
 @code{nil} to not use this face for the space between the end of the
 line and the edge of the window.  When Emacs merges several faces for
 displaying the empty space beyond end of line, only those faces with
-@code{:extend} non-@code{nil} will be merged.  By default, only
-@code{region} and @code{hl-line} faces have this attribute set to
-@code{t}.
+@code{:extend} non-@code{nil} will be merged.  By default, only a
+small number of faces, notably, @code{region}, have this attribute
+set.  This attribute is different from the others in that when a theme
+doesn't specify an explicit value for a face, the value from the
+original face definition by @code{defface} is inherited
+(@pxref{Defining Faces}).
 
 @end table
 
@@ -4913,7 +4914,7 @@ Recursive display specifications are not supported---@var{string}'s
 @code{display} properties, if any, are not used.
 
 @item (image . @var{image-props})
-This kind of display specification is an image descriptor (@pxref{Images}).
+This kind of display specification is an image descriptor (@pxref{Image Descriptors}).
 When used as a display specification, it means to display the image
 instead of the text that has the display specification.
 
@@ -5619,7 +5620,7 @@ area from the left of the original image, and if negative the offset
 from the right.  If @var{y} is a positive number it specifies the
 offset from the top of the original image, and if negative from the
 bottom.  If @var{x} or @var{y} are @code{nil} or unspecified the crop
-area will be centred on the original image.
+area will be centered on the original image.
 
 If the crop area is outside or overlaps the edge of the image it will
 be reduced to exclude any areas outside of the image.  This means it
@@ -5914,7 +5915,7 @@ Draw vertical lines.
 @deffn Command curveto coordinate-sets
 Using the first element in @var{coordinate-sets}, draw a cubic Bézier
 curve from the current point.  If there are multiple coordinate sets,
-draw a polybézier.  Each coordinate set is a list of the form
+draw a polybezier.  Each coordinate set is a list of the form
 @code{(@var{x1} @var{y1} @var{x2} @var{y2} @var{x} @var{y})}, where
 @w{(@var{x}, @var{y})} is the curve’s end point.  @w{(@var{x1},
 @var{y1})} and @w{(@var{x2}, @var{y2})} are control points at the
@@ -5931,7 +5932,7 @@ beginning and at the end, respectively.
 @deffn Command smooth-curveto coordinate-sets
 Using the first element in @var{coordinate-sets}, draw a cubic Bézier
 curve from the current point.  If there are multiple coordinate sets,
-draw a polybézier.  Each coordinate set is a list of the form
+draw a polybezier.  Each coordinate set is a list of the form
 @code{(@var{x2} @var{y2} @var{x} @var{y})}, where @w{(@var{x},
 @var{y})} is the curve’s end point and @w{(@var{x2}, @var{y2})} is the
 corresponding control point.  The first control point is the
@@ -5951,7 +5952,7 @@ coincides with the current point.
 @deffn Command quadratic-bezier-curveto coordinate-sets
 Using the first element in @var{coordinate-sets}, draw a quadratic
 Bézier curve from the current point.  If there are multiple coordinate
-sets, draw a polybézier.  Each coordinate set is a list of the form
+sets, draw a polybezier.  Each coordinate set is a list of the form
 @code{(@var{x1} @var{y1} @var{x} @var{y})}, where @w{(@var{x},
 @var{y})} is the curve’s end point and @w{(@var{x1}, @var{y1})} is the
 control point.
@@ -5969,7 +5970,7 @@ control point.
 @deffn Command smooth-quadratic-bezier-curveto coordinate-sets
 Using the first element in @var{coordinate-sets}, draw a quadratic
 Bézier curve from the current point.  If there are multiple coordinate
-sets, draw a polybézier.  Each coordinate set is a list of the form
+sets, draw a polybezier.  Each coordinate set is a list of the form
 @code{(@var{x} @var{y})}, where @w{(@var{x}, @var{y})} is the curve’s
 end point.  The control point is the reflection of the control point
 of the previous command relative to the current point, if that command