]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'origin/master' into feature/pgtk
authorPo Lu <luangruo@yahoo.com>
Fri, 3 Dec 2021 00:36:48 +0000 (08:36 +0800)
committerPo Lu <luangruo@yahoo.com>
Fri, 3 Dec 2021 00:36:48 +0000 (08:36 +0800)
1  2 
doc/lispref/display.texi
src/xdisp.c

Simple merge
diff --cc src/xdisp.c
Simple merge