Merge from origin/emacs-26

758e9a8 Revert "Don't mark main_thread (Bug#36155)"
1877b7b Don't mark main_thread (Bug#36155)
4904fb3 More quotation fixes (Bug#35885)
4cc4b5d ; * src/keyboard.c (tool_bar_items): Fix a typo.  (Bug#36143)
b58ecaf Minor copyedits in efaq-w32
48422af Tiny improvement of documentation of major mode conventions
25d44d2 * nt/addpm.c (main): Fix buffer overflow

6 files changed, 13 insertions, 8 deletions

diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index 4505bb5dc2d..e01dfa2677b 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -207,7 +207,7 @@ amount of work you can lose in case of a crash.  @xref{Auto Save}.
 
 @item
 Electric Quote mode automatically converts quotation marks.  For
-example, it requotes text typed @t{`like this'} to text @t{‘like
+example, it requotes text typed @kbd{`like this'} to text @t{‘like
 this’}.  You can control what kind of text it operates in, and you can
 disable it entirely in individual buffers.  @xref{Quotation Marks}.
 
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 1928240a878..59423feeeae 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -429,7 +429,7 @@ this"}.  Another common way is the curved quote convention, which uses
 left and right single or double quotation marks `@t{like this}' or
 ``@t{like this}''@footnote{
 The curved single quote characters are U+2018 @sc{left single quotation
-mark} and U+2018 @sc{right single quotation mark}; the curved double quotes
+mark} and U+2019 @sc{right single quotation mark}; the curved double quotes
 are U+201C @sc{left double quotation mark} and U+201D @sc{right double
 quotation mark}.  On text terminals which cannot display these
 characters, the Info reader might show them as the typewriter ASCII
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index f41607c5dc0..f7fb9a4417d 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -392,7 +392,9 @@ it provides a command that does the same job in a way better
 suited to the text this mode is used for.  For example, a major mode
 for editing a programming language might redefine @kbd{C-M-a} to
 move to the beginning of a function in a way that works better for
-that language.
+that language.  The recommended way of tailoring @kbd{C-M-a} to the
+needs of a major mode is to set @code{beginning-of-defun-function}
+(@pxref{List Motion}) to invoke the function specific to the mode.
 
 It is also legitimate for a major mode to rebind a standard key
 sequence whose standard meaning is rarely useful in that mode.  For
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 8e067a7a269..cdd01e47f00 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -1820,7 +1820,8 @@ If you want a quick solution without installing extra tools, a poor
 substitute that works for simple text searches is to specify the built
 in Windows command @command{findstr} as the command to run at the
 @kbd{M-x grep} prompt.  Normally you will want to use the @option{/n}
-argument to @command{findstr}.
+argument to @command{findstr}, to have it print the line numbers for
+each hit.
 
 @menu
 * Recursive grep::
@@ -1860,7 +1861,8 @@ path to the findutils @command{find} command.
 An alternative if you have a recent version of grep is to customize
 @code{grep-find-command} to use @samp{grep -r} instead of both find
 and grep.  Another alternative if you don't need the full capabilities
-of grep is to use @samp{findstr /n /r}.
+of grep is to use @samp{findstr /n /r}; add the @samp{/s} option if
+you want a recursive search.
 
 @c ------------------------------------------------------------
 @node Developing with Emacs
diff --git a/nt/addpm.c b/nt/addpm.c
index f71ce5f2385..a8bcd4a5c73 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -219,8 +219,9 @@ main (int argc, char *argv[])
         {
           int result;
 
-          char msg[ MAX_PATH ];
-          sprintf (msg, "Install Emacs at %s?\n", emacs_path);
+          const char install_msg[] = "Install Emacs at %s?\n";
+          char msg[ MAX_PATH + sizeof (install_msg) ];
+          sprintf (msg, install_msg, emacs_path);
           result = MessageBox (NULL, msg, "Install Emacs",
                                MB_OKCANCEL | MB_ICONQUESTION);
           if (result != IDOK)
diff --git a/src/keyboard.c b/src/keyboard.c
index bb4d185c914..ab6ca36219d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7969,7 +7969,7 @@ tool_bar_items (Lisp_Object reuse, int *nitems)
     {
       /* No, so use major and minor mode keymaps and keymap property.
          Note that tool-bar bindings in the local-map and keymap
-         properties may not work reliable, as they are only
+         properties may not work reliably, as they are only
          recognized when the tool-bar (or mode-line) is updated,
          which does not normally happen after every command.  */
       ptrdiff_t nminor = current_minor_maps (NULL, &tmaps);