projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d096819 8033947)
Merge from origin/emacs-28
authorStefan Kangas <stefankangas@gmail.com>
Wed, 28 Sep 2022 14:38:31 +0000 (16:38 +0200)
committerStefan Kangas <stefankangas@gmail.com>
Wed, 28 Sep 2022 14:38:31 +0000 (16:38 +0200)
8033947fe2 .mailcap: Some additional fixes.
b1e92c59ed Avoid assertion violations in 'pop_it'

1  2 
src/xdisp.c patch | diff1 | diff2 | blob | history

diff --cc src/xdisp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.