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: 904aaab 3b6338c)

author	Eli Zaretskii <eliz@gnu.org>
	Thu, 28 Apr 2022 15:37:34 +0000 (18:37 +0300)
committer	Eli Zaretskii <eliz@gnu.org>
	Thu, 28 Apr 2022 15:37:34 +0000 (18:37 +0300)
commit	b3023de5431fc308e2a6db61ed4fdd18db785324
tree	ca1c8f1adcde2d7192fe7991a672a89139f2610e	tree \| snapshot
parent	904aaabb0516b98b6195b3e8a37ea85d50a8d185	commit \| diff
parent	3b6338c8c351cce721f2f1aa115cadc401179d5c	commit \| diff

Merge from origin/emacs-28

# Conflicts:
# lisp/progmodes/xref.el

17 files changed:

doc/lispref/display.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/minibuf.texi	diff1 \|	diff2 \|	blob \| history
lisp/dired-aux.el	diff1 \|	diff2 \|	blob \| history
lisp/emulation/viper-cmd.el	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	diff1 \|	diff2 \|	blob \| history
lisp/isearch.el	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp-sh.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/ebrowse.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/etags.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/project.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/xref.el	diff1 \|	diff2 \|	blob \| history
lisp/replace.el	diff1 \|	diff2 \|	blob \| history
lisp/textmodes/reftex-global.el	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-dir.el	diff1 \|	diff2 \|	blob \| history
src/font.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
src/xfaces.c	diff1 \|	diff2 \|	blob \| history

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