]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Thu, 27 Jan 2022 08:45:49 +0000 (09:45 +0100)
committerStefan Kangas <stefan@marxist.se>
Thu, 27 Jan 2022 08:45:49 +0000 (09:45 +0100)
commita8862f313b92ac0fad35c7240ef4da8e52d55c1d
tree732e3ecae25bf1d6528165417a0b53cc835baf38
parent82aa5be7ce1d5f508d42a4bb394760198a1c6e62
parentc9524819eaf4e561a184b04dfca7e42970dc8809
Merge from origin/emacs-28

c9524819ea Partially revert a fill-region-as-paragraph regression
6075ea0b79 Fix 'make_lispy_position' when there's an image at EOB

# Conflicts:
# test/lisp/textmodes/fill-tests.el
lisp/textmodes/fill.el
src/xdisp.c
test/lisp/textmodes/fill-tests.el