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, 1 insertions, 1 deletions

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);