• Eli Zaretskii's avatar
    Merge from origin/emacs-28 · dcd76bd4
    Eli Zaretskii authored
    836be7a1 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
    86cbc6ee * lisp/net/tramp-sh.el: Adapt copyright year
    ebe8772f ; Minor fixes related to copyright years
    23c1ee69 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
    8d3fc7ec * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
    19dcb237 ; 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
    dcd76bd4