]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'origin/master' into scratch/pkg
authorGerd Möllmann <gerd@gnu.org>
Sat, 22 Jul 2023 12:21:18 +0000 (14:21 +0200)
committerGerd Möllmann <gerd@gnu.org>
Sat, 22 Jul 2023 12:21:18 +0000 (14:21 +0200)
1  2 
lisp/emacs-lisp/macroexp.el
src/xdisp.c

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