Eli Zaretskii dcd76bd48d Merge from origin/emacs-28 ... 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4		2022-01-01 07:03:03 -05:00
..
add-log.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
compare-w.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
cvs-status.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
diff-mode.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
diff.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
ediff-diff.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
ediff-help.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
ediff-hook.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
ediff-init.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
ediff-merg.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
ediff-mult.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
ediff-ptch.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
ediff-util.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
ediff-vers.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
ediff-wind.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
ediff.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
emerge.el	Add indent declaration to emerge-defvar-local	2021-09-18 09:40:29 +02:00
log-edit.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
log-view.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
pcvs-defs.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
pcvs-info.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
pcvs-parse.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
pcvs-util.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
pcvs.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
smerge-mode.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-annotate.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
vc-bzr.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
vc-cvs.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-dav.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-dir.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-dispatcher.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-filewise.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
vc-git.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-hg.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-hooks.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-mtn.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
vc-rcs.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-sccs.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
vc-src.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
vc-svn.el	; Add 2022 to copyright years.	2022-01-01 02:45:51 -05:00
vc.el	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00