]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' into scratch/font_lock_large_files scratch/font_lock_large_files
authorDmitry Gutov <dgutov@yandex.ru>
Sun, 14 Aug 2022 23:22:59 +0000 (02:22 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Sun, 14 Aug 2022 23:22:59 +0000 (02:22 +0300)
1  2 
src/xdisp.c

diff --cc src/xdisp.c
Simple merge