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/eshell | |
| 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/eshell')
| -rw-r--r-- | test/lisp/eshell/em-hist-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/eshell/em-ls-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/eshell/esh-opt-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/eshell/eshell-tests.el | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/lisp/eshell/em-hist-tests.el b/test/lisp/eshell/em-hist-tests.el index 5bc5690675d..634e9819839 100644 --- a/test/lisp/eshell/em-hist-tests.el +++ b/test/lisp/eshell/em-hist-tests.el @@ -1,6 +1,6 @@ ;;; em-hist-tests.el --- em-hist test suite -*- lexical-binding:t -*- -;; Copyright (C) 2017-2021 Free Software Foundation, Inc. +;; Copyright (C) 2017-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el index 3ea11ab2de1..272280e81c7 100644 --- a/test/lisp/eshell/em-ls-tests.el +++ b/test/lisp/eshell/em-ls-tests.el @@ -1,6 +1,6 @@ ;;; em-ls-tests.el --- em-ls test suite -*- lexical-binding:t -*- -;; Copyright (C) 2017-2021 Free Software Foundation, Inc. +;; Copyright (C) 2017-2022 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> diff --git a/test/lisp/eshell/esh-opt-tests.el b/test/lisp/eshell/esh-opt-tests.el index e2a0ea59d1c..532adfb733a 100644 --- a/test/lisp/eshell/esh-opt-tests.el +++ b/test/lisp/eshell/esh-opt-tests.el @@ -1,6 +1,6 @@ ;;; esh-opt-tests.el --- esh-opt test suite -*- lexical-binding:t -*- -;; Copyright (C) 2018-2021 Free Software Foundation, Inc. +;; Copyright (C) 2018-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/eshell/eshell-tests.el b/test/lisp/eshell/eshell-tests.el index 0974784ef4c..aef14479078 100644 --- a/test/lisp/eshell/eshell-tests.el +++ b/test/lisp/eshell/eshell-tests.el @@ -1,6 +1,6 @@ ;;; eshell-tests.el --- Eshell test suite -*- lexical-binding:t -*- -;; Copyright (C) 1999-2021 Free Software Foundation, Inc. +;; Copyright (C) 1999-2022 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> |