emacs/lisp/emulation
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
..
cua-base.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00
cua-gmrk.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
cua-rect.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00
edt-lk201.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
edt-mapper.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
edt-pc.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
edt-vt100.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
edt.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
keypad.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
viper-cmd.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00
viper-ex.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00
viper-init.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00
viper-keym.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
viper-macs.el ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
viper-mous.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00
viper-util.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00
viper.el Merge from origin/emacs-28 2022-01-01 07:03:03 -05:00