git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 391acd9 a772c0b)

author	Stefan Kangas <stefan@marxist.se>
	Fri, 24 Jun 2022 11:52:51 +0000 (13:52 +0200)
committer	Stefan Kangas <stefan@marxist.se>
	Fri, 24 Jun 2022 11:52:51 +0000 (13:52 +0200)
commit	81e58d1ce5a16fbe4cad543b1b011fe52da5d70c
tree	fb74ce8496311b34d68ae04de01c76810b1add1b	tree \| snapshot
parent	391acd91344c833d94d89b2862b272d08643c068	commit \| diff
parent	a772c0b85272bc20858a35af5f619983cfcb0084	commit \| diff

Merge from origin/emacs-28

a772c0b852 ; Fix typos: prefer US spelling.

# Conflicts:
# doc/misc/modus-themes.org

doc/misc/modus-themes.org	diff1 \|	diff2 \|	blob \| history
doc/misc/texinfo.tex	diff1 \|	diff2 \|	blob \| history
etc/themes/modus-themes.el	diff1 \|	diff2 \|	blob \| history
lisp/icomplete.el	diff1 \|	diff2 \|	blob \| history
lisp/net/rcirc.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/elisp-mode.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/hideif.el	diff1 \|	diff2 \|	blob \| history
lisp/so-long.el	diff1 \|	diff2 \|	blob \| history
test/lisp/so-long-tests/so-long-tests.el	diff1 \|	diff2 \|	blob \| history
test/src/fns-tests.el	diff1 \|	diff2 \|	blob \| history
test/src/keymap-tests.el	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.