]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorGlenn Morris <rgm@gnu.org>
Sat, 16 Oct 2021 16:18:37 +0000 (09:18 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 16 Oct 2021 16:18:37 +0000 (09:18 -0700)
commit536968304bd2ab70819b2920fc015e4bf9330636
tree9a3936312a2e00c0b15888a59a4273425dc2ba18
parentffff168d5fb14fbfa74f7c04fab0235a14bb7e64
parente8488808dfe1460ce07042a1a523097ab90cf079
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
doc/lispref/display.texi
doc/lispref/os.texi
lisp/bookmark.el
lisp/filenotify.el
lisp/gnus/gnus-undo.el
lisp/menu-bar.el
lisp/progmodes/compile.el
lisp/window.el
src/xdisp.c
test/lisp/filenotify-tests.el