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 /test/lisp/cedet/semantic | |
parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.bz2 emacs-dcd76bd48df678d8234b904d7b13c997228519a3.zip |
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 'test/lisp/cedet/semantic')
-rw-r--r-- | test/lisp/cedet/semantic/bovine/gcc-tests.el | 2 | ||||
-rw-r--r-- | test/lisp/cedet/semantic/format-resources/test-fmt.cpp | 2 | ||||
-rw-r--r-- | test/lisp/cedet/semantic/format-resources/test-fmt.el | 2 | ||||
-rw-r--r-- | test/lisp/cedet/semantic/format-tests.el | 2 | ||||
-rw-r--r-- | test/lisp/cedet/semantic/fw-tests.el | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/lisp/cedet/semantic/bovine/gcc-tests.el b/test/lisp/cedet/semantic/bovine/gcc-tests.el index 04a02ec03bd..2e61f91e58c 100644 --- a/test/lisp/cedet/semantic/bovine/gcc-tests.el +++ b/test/lisp/cedet/semantic/bovine/gcc-tests.el @@ -1,6 +1,6 @@ ;;; gcc-tests.el --- Tests for semantic/bovine/gcc.el -*- lexical-binding:t -*- -;; Copyright (C) 2003-2021 Free Software Foundation, Inc. +;; Copyright (C) 2003-2022 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/cedet/semantic/format-resources/test-fmt.cpp b/test/lisp/cedet/semantic/format-resources/test-fmt.cpp index ab869c1ce00..39843a22194 100644 --- a/test/lisp/cedet/semantic/format-resources/test-fmt.cpp +++ b/test/lisp/cedet/semantic/format-resources/test-fmt.cpp @@ -1,6 +1,6 @@ /** test-fmt.cpp --- Signatures, and format answers for testing * - * Copyright (C) 2012, 2016, 2019-2021 Free Software Foundation, Inc. + * Copyright (C) 2012, 2016, 2019-2022 Free Software Foundation, Inc. * * Author: Eric M. Ludlam <zappo@gnu.org> * diff --git a/test/lisp/cedet/semantic/format-resources/test-fmt.el b/test/lisp/cedet/semantic/format-resources/test-fmt.el index 8458a8e6510..5fcb8ef3c36 100644 --- a/test/lisp/cedet/semantic/format-resources/test-fmt.el +++ b/test/lisp/cedet/semantic/format-resources/test-fmt.el @@ -1,6 +1,6 @@ ;;; test-fmt.el --- test semantic tag formatting -*- lexical-binding: t -*- -;; Copyright (C) 2012-2021 Free Software Foundation, Inc. +;; Copyright (C) 2012-2022 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/cedet/semantic/format-tests.el b/test/lisp/cedet/semantic/format-tests.el index 149f408af15..f698d865c3c 100644 --- a/test/lisp/cedet/semantic/format-tests.el +++ b/test/lisp/cedet/semantic/format-tests.el @@ -1,6 +1,6 @@ ;;; semantic/format-tests.el --- Parsing / Formatting tests -*- lexical-binding:t -*- -;; Copyright (C) 2003-2021 Free Software Foundation, Inc. +;; Copyright (C) 2003-2022 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/cedet/semantic/fw-tests.el b/test/lisp/cedet/semantic/fw-tests.el index 6a5f3c85fc6..c8bfffb3cf5 100644 --- a/test/lisp/cedet/semantic/fw-tests.el +++ b/test/lisp/cedet/semantic/fw-tests.el @@ -1,6 +1,6 @@ ;;; fw-tests.el --- Tests for semantic/fw.el -*- lexical-binding:t -*- -;; Copyright (C) 2003-2021 Free Software Foundation, Inc. +;; Copyright (C) 2003-2022 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> |