Merge from origin/emacs-28

e8488808df Avoid aborts when a thread is signaled while "waiting for ...
21397cce51 Improve documentation string for 'compilation-error-regexp...
2971a6890f * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix t...
e842d7f29a Fix removal of fringe indication of bookmarks
b5a0eda978 Prefer "graphical displays" to "X terminals" in documentation
4ad0fc0dd0 Precise documentation of file-notify-add-watch
f5b8df14c6 Fixes to account for windows' tab lines
ced72b6e4c * Fix `native-compile-target-directory' effectiveness on t...
502788bc3d Add missing single quotes in the Emacs manual
1af45ad04e ; * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix...
12654b7423 * lisp/menu-bar.el (yank-menu-length): Fix docstring (bug#...

# Conflicts:
#	lisp/gnus/gnus-undo.el
#	lisp/menu-bar.el

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/os.texi
Simple merge

diff --cc lisp/bookmark.el
Simple merge

diff --cc lisp/filenotify.el
Simple merge

diff --cc lisp/gnus/gnus-undo.el
index 182c8743e09b74a9c6c65e34ed69e1f6831fdd52,07cf5d495a6c11f3c52e77548b2b8b1db9f0da13..0717a7ccfbad7d22e95b095f43556946e1c682e5
--- 1/lisp/gnus/gnus-undo.el
--- 2/lisp/gnus/gnus-undo.el
+++ b/lisp/gnus/gnus-undo.el
@@@ -75,12 -75,15 +75,12 @@@
  
  ;;; Minor mode definition.
  
 -(defvar gnus-undo-mode-map
 -  (let ((map (make-sparse-keymap)))
 -    (gnus-define-keys map
 -      "\M-\C-_"     gnus-undo
 -      "\C-_"        gnus-undo
 -      "\C-xu"       gnus-undo
 -      ;; Many people are used to type `C-/' on GUI frames and get `C-_'.
 -      [(control /)] gnus-undo)
 -    map))
 +(defvar-keymap gnus-undo-mode-map
 +  "\M-\C-_" #'gnus-undo
 +  "\C-_" #'gnus-undo
 +  "\C-xu" #'gnus-undo
-   ;; many people are used to type `C-/' on X terminals and get `C-_'.
++  ;; many people are used to type `C-/' on GUI frames and get `C-_'.
 +  [(control /)] #'gnus-undo)
  
  (defun gnus-undo-make-menu-bar ()
    ;; This is disabled for the time being.

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/progmodes/compile.el
Simple merge

diff --cc lisp/window.el
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc test/lisp/filenotify-tests.el
Simple merge