]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Tue, 7 Jul 2020 14:50:39 +0000 (07:50 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 7 Jul 2020 14:50:39 +0000 (07:50 -0700)
59e768d64a Fix undefined behavior in json.c (Bug#42113)
cce00bef03 Fix ACTION argument of 'display-buffer' call in gud.el
0121db2702 * src/keyboard.c (Fclear_this_command_keys): Doc fix.
b9abf5ceb2 Improve do string of 'man'
b87fc938a0 ; * src/xdisp.c (pos_visible_p): Yet another minor fix for...

1  2 
lisp/man.el
lisp/progmodes/gud.el
src/json.c
src/keyboard.c
src/xdisp.c

diff --cc lisp/man.el
Simple merge
Simple merge
diff --cc src/json.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/xdisp.c
Simple merge