]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Mon, 21 Sep 2020 00:18:16 +0000 (17:18 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 21 Sep 2020 00:18:16 +0000 (17:18 -0700)
commit3675993d76cc6db43703240d0ff0fd892abf1b41
tree2615512bfb3d569b679efb09711dad1cea7536cc
parent15c594c282176cf8e29072de2934a046922053b1
parentdf04f3e755f3001ebb9cc428faa7fa46059e636b
Merge from origin/emacs-27

df04f3e755 Fix a rare segfault in syntax.c
fd1fe1e1ec Add doc to syntax-propertize-function saying it must do a ...
fcd599bbea Minor copyedits of doc of 'with-silent-modifications'
759399cdb1 Improve documentation of 'max-mini-window-height'
3223302aa2 Use modern constant names for the NS pasteboard
985703d380 Fix doc string of 'toggle-menu-bar-mode-from-frame'
184a4977c7 Make vc-bzr tests work with brz 3.1 (bug#43314)

# Conflicts:
# lisp/emacs-lisp/syntax.el
# src/syntax.c
doc/lispref/minibuf.texi
doc/lispref/text.texi
lisp/emacs-lisp/syntax.el
lisp/menu-bar.el
src/nsterm.m
src/syntax.c
src/xdisp.c