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

1 files changed, 3 insertions, 2 deletions

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)