diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
| commit | dcd76bd48df678d8234b904d7b13c997228519a3 (patch) | |
| tree | 17b11e7d3aa1aa9d32d6be874cbbfb1e5882a2c5 /admin/unidata | |
| parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
| parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
| download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz | |
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
Diffstat (limited to 'admin/unidata')
| -rw-r--r-- | admin/unidata/Makefile.in | 2 | ||||
| -rwxr-xr-x | admin/unidata/blocks.awk | 2 | ||||
| -rw-r--r-- | admin/unidata/emoji-zwj.awk | 2 | ||||
| -rw-r--r-- | admin/unidata/unidata-gen.el | 2 | ||||
| -rw-r--r-- | admin/unidata/uvs.el | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index 011e97b3d10..45bba85213b 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2012-2021 Free Software Foundation, Inc. +# Copyright (C) 2012-2022 Free Software Foundation, Inc. # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/unidata/blocks.awk b/admin/unidata/blocks.awk index 314ac3e9394..48d8c873c7a 100755 --- a/admin/unidata/blocks.awk +++ b/admin/unidata/blocks.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 2015-2021 Free Software Foundation, Inc. +## Copyright (C) 2015-2022 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/admin/unidata/emoji-zwj.awk b/admin/unidata/emoji-zwj.awk index e704cb45263..3d605d5d640 100644 --- a/admin/unidata/emoji-zwj.awk +++ b/admin/unidata/emoji-zwj.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 2020 Free Software Foundation, Inc. +## Copyright (C) 2020, 2022 Free Software Foundation, Inc. ## Author: Robert Pluim <rpluim@gmail.com> diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index abd41e34a48..d6b5a476bb0 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -1,6 +1,6 @@ ;;; unidata-gen.el --- Create files containing character property data -*- lexical-binding:t -*- -;; Copyright (C) 2008-2021 Free Software Foundation, Inc. +;; Copyright (C) 2008-2022 Free Software Foundation, Inc. ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el index 0141b638fb2..5a4b8e71a2d 100644 --- a/admin/unidata/uvs.el +++ b/admin/unidata/uvs.el @@ -1,6 +1,6 @@ ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts -*- lexical-binding:t -*- -;; Copyright (C) 2014-2021 Free Software Foundation, Inc. +;; Copyright (C) 2014-2022 Free Software Foundation, Inc. ;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |