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

38 files changed, 443 insertions, 443 deletions

diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index c84e7ed7310..d7fa359bf8d 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -1,6 +1,6 @@
 ;;; biditest.el --- test bidi reordering in GNU Emacs display engine.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2022 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index af6b4defb3c..b365908c639 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -1,6 +1,6 @@
 ;;; cedet-utests.el --- Run all unit tests in the CEDET suite.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2022 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/cedet/ede-tests.el b/test/manual/cedet/ede-tests.el
index 17618381ef2..c23e0984816 100644
--- a/test/manual/cedet/ede-tests.el
+++ b/test/manual/cedet/ede-tests.el
@@ -1,6 +1,6 @@
 ;;; ede-tests.el --- Some tests for the Emacs Development Environment  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2008-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2022 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/cedet/semantic-tests.el b/test/manual/cedet/semantic-tests.el
index 3e416cc6b20..dcdeb45b0a3 100644
--- a/test/manual/cedet/semantic-tests.el
+++ b/test/manual/cedet/semantic-tests.el
@@ -1,6 +1,6 @@
 ;;; semantic-tests.el --- Miscellaneous Semantic 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/manual/cedet/tests/test.c b/test/manual/cedet/tests/test.c
index 2cdaf4fb0ab..6efaa8a75eb 100644
--- a/test/manual/cedet/tests/test.c
+++ b/test/manual/cedet/tests/test.c
@@ -1,6 +1,6 @@
 /* test.c --- Semantic unit test for C.
 
-   Copyright (C) 2001-2021 Free Software Foundation, Inc.
+   Copyright (C) 2001-2022 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/cedet/tests/test.el b/test/manual/cedet/tests/test.el
index 246a856665b..a523438f68f 100644
--- a/test/manual/cedet/tests/test.el
+++ b/test/manual/cedet/tests/test.el
@@ -1,6 +1,6 @@
 ;;; test.el --- Unit test file for Semantic Emacs Lisp support.  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/cedet/tests/test.make b/test/manual/cedet/tests/test.make
index 9841567b6b2..80c0c8051c4 100644
--- a/test/manual/cedet/tests/test.make
+++ b/test/manual/cedet/tests/test.make
@@ -1,6 +1,6 @@
 # test.make --- Semantic unit test for Make -*- makefile -*-
 
-# Copyright (C) 2001-2002, 2010-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2010-2022 Free Software Foundation, Inc.
 
 # Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/cedet/tests/testpolymorph.cpp b/test/manual/cedet/tests/testpolymorph.cpp
index e4befcf0ff5..ba64e39a7a5 100644
--- a/test/manual/cedet/tests/testpolymorph.cpp
+++ b/test/manual/cedet/tests/testpolymorph.cpp
@@ -1,6 +1,6 @@
 /** testpolymorph.cpp --- A sequence of polymorphism examples.
  *
- * Copyright (C) 2009-2021 Free Software Foundation, Inc.
+ * Copyright (C) 2009-2022 Free Software Foundation, Inc.
  *
  * Author: Eric M. Ludlam <zappo@gnu.org>
  *
diff --git a/test/manual/cedet/tests/testspp.c b/test/manual/cedet/tests/testspp.c
index 2698f48d5f9..74b336172cd 100644
--- a/test/manual/cedet/tests/testspp.c
+++ b/test/manual/cedet/tests/testspp.c
@@ -1,6 +1,6 @@
 /* testspp.cpp --- Semantic unit test for the C preprocessor
 
-   Copyright (C) 2007-2021 Free Software Foundation, Inc.
+   Copyright (C) 2007-2022 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/cedet/tests/testsppreplace.c b/test/manual/cedet/tests/testsppreplace.c
index 42a22e14b09..54ae3f0323e 100644
--- a/test/manual/cedet/tests/testsppreplace.c
+++ b/test/manual/cedet/tests/testsppreplace.c
@@ -1,5 +1,5 @@
 /* testsppreplace.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2021 Free Software Foundation, Inc.
+   Copyright (C) 2007-2022 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/cedet/tests/testsppreplaced.c b/test/manual/cedet/tests/testsppreplaced.c
index d546d61bff6..c359fa7d690 100644
--- a/test/manual/cedet/tests/testsppreplaced.c
+++ b/test/manual/cedet/tests/testsppreplaced.c
@@ -1,5 +1,5 @@
 /* testsppreplaced.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2021 Free Software Foundation, Inc.
+   Copyright (C) 2007-2022 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index 4eae68b5c25..1b4f80ceaac 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -2202,73 +2202,73 @@ el-src/emacs/lisp/progmodes/etags.el,5069
 (defun visit-tags-table-buffer 543,22204
 (defun tags-reset-tags-tables 712,28514
 (defun file-of-tag 731,29171
-(defun tags-table-files 740,29520
-(defun tags-included-tables 749,29870
-(defun tags-completion-table 755,30116
-(defun tags-lazy-completion-table 783,31310
-(defun tags-completion-at-point-function 799,31945
-(defun find-tag-tag 818,32695
-(defvar last-tag 837,33368
-(defun find-tag-interactive 840,33427
-(defvar find-tag-history 852,33842
-(defun find-tag-noselect 860,34012
-(defun find-tag 932,37126
-(defun find-tag-other-window 959,38342
-(defun find-tag-other-frame 1000,40270
-(defun find-tag-regexp 1025,41444
-(defalias 'pop-tag-mark pop-tag-mark
1049,42606
-(defvar tag-lines-already-matched 1052,42657
-(defun find-tag-in-order 1055,42764
-(defun tag-find-file-of-tag-noselect 1167,47110
-(defun tag-find-file-of-tag 1200,48956
-(defun etags-recognize-tags-table 1208,49182
-(defun etags-verify-tags-table 1241,50813
-(defun etags-file-of-tag 1246,51011
-(defun etags-tags-completion-table 1256,51346
-(defun etags-snarf-tag 1286,52552
-(defun etags-goto-tag-location 1324,54121
-(defun etags-list-tags 1388,56564
-(defmacro tags-with-face 1423,57839
-(defun etags-tags-apropos-additional 1431,58172
-(defun etags-tags-apropos 1465,59409
-(defun etags-tags-table-files 1527,61618
-(defun etags-tags-included-tables 1542,62054
-(defun tags-recognize-empty-tags-table 1559,62594
-(defun tag-exact-file-name-match-p 1587,63740
-(defun tag-file-name-match-p 1596,64133
-(defun tag-exact-match-p 1609,64689
-(defun tag-implicit-name-match-p 1620,65257
-(defun tag-symbol-match-p 1633,65857
-(defun tag-word-match-p 1643,66293
-(defun tag-partial-file-name-match-p 1652,66691
-(defun tag-any-match-p 1662,67135
-(defun tag-re-match-p 1667,67319
-(defcustom tags-loop-revert-buffers 1675,67568
-(defun next-file 1685,67977
-(defvar tags-loop-operate 1760,70891
-(defvar tags-loop-scan1763,70985
-(defun tags-loop-eval 1771,71314
-(defun tags-loop-continue 1782,71643
-(defun tags-search 1850,73949
-(defun tags-query-replace 1871,74775
-(defun tags-complete-tags-table-file 1896,75999
-(defun list-tags 1906,76378
-(defun tags-apropos 1934,77331
-(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78157
-(defun select-tags-table 1964,78396
-(defvar select-tags-table-mode-map 2019,80523
-(define-derived-mode select-tags-table-mode 2030,80906
-(defun select-tags-table-select 2034,81090
-(defun select-tags-table-quit 2043,81456
-(defun complete-tag 2049,81611
-(defconst etags--xref-limit 2074,82552
-(defvar etags-xref-find-definitions-tag-order 2076,82587
-(defun etags-xref-find 2082,82877
-(defun etags--xref-find-definitions 2096,83406
-(defclass xref-etags-location 2129,85120
-(defun xref-make-etags-location 2135,85343
-(cl-defmethod xref-location-marker 2139,85498
-(cl-defmethod xref-location-line 2146,85742
+(defun tags-table-files 740,29521
+(defun tags-included-tables 749,29871
+(defun tags-completion-table 755,30117
+(defun tags-lazy-completion-table 783,31311
+(defun tags-completion-at-point-function 799,31946
+(defun find-tag-tag 818,32696
+(defvar last-tag 837,33369
+(defun find-tag-interactive 840,33428
+(defvar find-tag-history 852,33843
+(defun find-tag-noselect 860,34013
+(defun find-tag 932,37127
+(defun find-tag-other-window 959,38343
+(defun find-tag-other-frame 1000,40271
+(defun find-tag-regexp 1025,41445
+(defalias 'pop-tag-mark pop-tag-mark
1049,42607
+(defvar tag-lines-already-matched 1052,42658
+(defun find-tag-in-order 1055,42765
+(defun tag-find-file-of-tag-noselect 1167,47111
+(defun tag-find-file-of-tag 1200,48957
+(defun etags-recognize-tags-table 1208,49183
+(defun etags-verify-tags-table 1241,50814
+(defun etags-file-of-tag 1246,51012
+(defun etags-tags-completion-table 1256,51347
+(defun etags-snarf-tag 1286,52553
+(defun etags-goto-tag-location 1324,54122
+(defun etags-list-tags 1388,56565
+(defmacro tags-with-face 1423,57840
+(defun etags-tags-apropos-additional 1431,58173
+(defun etags-tags-apropos 1465,59410
+(defun etags-tags-table-files 1527,61619
+(defun etags-tags-included-tables 1542,62055
+(defun tags-recognize-empty-tags-table 1559,62595
+(defun tag-exact-file-name-match-p 1587,63741
+(defun tag-file-name-match-p 1596,64134
+(defun tag-exact-match-p 1609,64690
+(defun tag-implicit-name-match-p 1620,65258
+(defun tag-symbol-match-p 1633,65858
+(defun tag-word-match-p 1643,66294
+(defun tag-partial-file-name-match-p 1652,66692
+(defun tag-any-match-p 1662,67136
+(defun tag-re-match-p 1667,67320
+(defcustom tags-loop-revert-buffers 1675,67569
+(defun next-file 1685,67978
+(defvar tags-loop-operate 1760,70892
+(defvar tags-loop-scan1763,70986
+(defun tags-loop-eval 1771,71315
+(defun tags-loop-continue 1782,71644
+(defun tags-search 1850,73950
+(defun tags-query-replace 1871,74776
+(defun tags-complete-tags-table-file 1896,76000
+(defun list-tags 1906,76379
+(defun tags-apropos 1934,77332
+(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78158
+(defun select-tags-table 1964,78397
+(defvar select-tags-table-mode-map 2019,80524
+(define-derived-mode select-tags-table-mode 2030,80907
+(defun select-tags-table-select 2034,81091
+(defun select-tags-table-quit 2043,81457
+(defun complete-tag 2049,81612
+(defconst etags--xref-limit 2074,82553
+(defvar etags-xref-find-definitions-tag-order 2076,82588
+(defun etags-xref-find 2082,82878
+(defun etags--xref-find-definitions 2096,83407
+(defclass xref-etags-location 2129,85121
+(defun xref-make-etags-location 2135,85344
+(cl-defmethod xref-location-marker 2139,85499
+(cl-defmethod xref-location-line 2146,85743
 
 erl-src/gs_dialog.erl,98
 -define(VERSION2,32
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index 45979d6a763..124aa7fc1cf 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -2771,76 +2771,76 @@ el-src/emacs/lisp/progmodes/etags.el,5188
 (defun visit-tags-table-buffer 543,22204
 (defun tags-reset-tags-tables 712,28514
 (defun file-of-tag 731,29171
-(defun tags-table-files 740,29520
-(defun tags-included-tables 749,29870
-(defun tags-completion-table 755,30116
-(defun tags-lazy-completion-table 783,31310
-(defun tags-completion-at-point-function 799,31945
-(defun find-tag-tag 818,32695
-(defvar last-tag 837,33368
-(defun find-tag-interactive 840,33427
-(defvar find-tag-history 852,33842
-(defvar etags-case-fold-search)855,33907
-(defvar etags-syntax-table)856,33939
-(defvar local-find-tag-hook)857,33967
-(defun find-tag-noselect 860,34012
-(defun find-tag 932,37126
-(defun find-tag-other-window 959,38342
-(defun find-tag-other-frame 1000,40270
-(defun find-tag-regexp 1025,41444
-(defalias 'pop-tag-mark pop-tag-mark
1049,42606
-(defvar tag-lines-already-matched 1052,42657
-(defun find-tag-in-order 1055,42764
-(defun tag-find-file-of-tag-noselect 1167,47110
-(defun tag-find-file-of-tag 1200,48956
-(defun etags-recognize-tags-table 1208,49182
-(defun etags-verify-tags-table 1241,50813
-(defun etags-file-of-tag 1246,51011
-(defun etags-tags-completion-table 1256,51346
-(defun etags-snarf-tag 1286,52552
-(defun etags-goto-tag-location 1324,54121
-(defun etags-list-tags 1388,56564
-(defmacro tags-with-face 1423,57839
-(defun etags-tags-apropos-additional 1431,58172
-(defun etags-tags-apropos 1465,59409
-(defun etags-tags-table-files 1527,61618
-(defun etags-tags-included-tables 1542,62054
-(defun tags-recognize-empty-tags-table 1559,62594
-(defun tag-exact-file-name-match-p 1587,63740
-(defun tag-file-name-match-p 1596,64133
-(defun tag-exact-match-p 1609,64689
-(defun tag-implicit-name-match-p 1620,65257
-(defun tag-symbol-match-p 1633,65857
-(defun tag-word-match-p 1643,66293
-(defun tag-partial-file-name-match-p 1652,66691
-(defun tag-any-match-p 1662,67135
-(defun tag-re-match-p 1667,67319
-(defcustom tags-loop-revert-buffers 1675,67568
-(defun next-file 1685,67977
-(defvar tags-loop-operate 1760,70891
-(defvar tags-loop-scan1763,70985
-(defun tags-loop-eval 1771,71314
-(defun tags-loop-continue 1782,71643
-(defun tags-search 1850,73949
-(defun tags-query-replace 1871,74775
-(defun tags-complete-tags-table-file 1896,75999
-(defun list-tags 1906,76378
-(defun tags-apropos 1934,77331
-(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78157
-(defun select-tags-table 1964,78396
-(defvar select-tags-table-mode-map 2019,80523
-(define-derived-mode select-tags-table-mode 2030,80906
-(defun select-tags-table-select 2034,81090
-(defun select-tags-table-quit 2043,81456
-(defun complete-tag 2049,81611
-(defconst etags--xref-limit 2074,82552
-(defvar etags-xref-find-definitions-tag-order 2076,82587
-(defun etags-xref-find 2082,82877
-(defun etags--xref-find-definitions 2096,83406
-(defclass xref-etags-location 2129,85120
-(defun xref-make-etags-location 2135,85343
-(cl-defmethod xref-location-marker 2139,85498
-(cl-defmethod xref-location-line 2146,85742
+(defun tags-table-files 740,29521
+(defun tags-included-tables 749,29871
+(defun tags-completion-table 755,30117
+(defun tags-lazy-completion-table 783,31311
+(defun tags-completion-at-point-function 799,31946
+(defun find-tag-tag 818,32696
+(defvar last-tag 837,33369
+(defun find-tag-interactive 840,33428
+(defvar find-tag-history 852,33843
+(defvar etags-case-fold-search)855,33908
+(defvar etags-syntax-table)856,33940
+(defvar local-find-tag-hook)857,33968
+(defun find-tag-noselect 860,34013
+(defun find-tag 932,37127
+(defun find-tag-other-window 959,38343
+(defun find-tag-other-frame 1000,40271
+(defun find-tag-regexp 1025,41445
+(defalias 'pop-tag-mark pop-tag-mark
1049,42607
+(defvar tag-lines-already-matched 1052,42658
+(defun find-tag-in-order 1055,42765
+(defun tag-find-file-of-tag-noselect 1167,47111
+(defun tag-find-file-of-tag 1200,48957
+(defun etags-recognize-tags-table 1208,49183
+(defun etags-verify-tags-table 1241,50814
+(defun etags-file-of-tag 1246,51012
+(defun etags-tags-completion-table 1256,51347
+(defun etags-snarf-tag 1286,52553
+(defun etags-goto-tag-location 1324,54122
+(defun etags-list-tags 1388,56565
+(defmacro tags-with-face 1423,57840
+(defun etags-tags-apropos-additional 1431,58173
+(defun etags-tags-apropos 1465,59410
+(defun etags-tags-table-files 1527,61619
+(defun etags-tags-included-tables 1542,62055
+(defun tags-recognize-empty-tags-table 1559,62595
+(defun tag-exact-file-name-match-p 1587,63741
+(defun tag-file-name-match-p 1596,64134
+(defun tag-exact-match-p 1609,64690
+(defun tag-implicit-name-match-p 1620,65258
+(defun tag-symbol-match-p 1633,65858
+(defun tag-word-match-p 1643,66294
+(defun tag-partial-file-name-match-p 1652,66692
+(defun tag-any-match-p 1662,67136
+(defun tag-re-match-p 1667,67320
+(defcustom tags-loop-revert-buffers 1675,67569
+(defun next-file 1685,67978
+(defvar tags-loop-operate 1760,70892
+(defvar tags-loop-scan1763,70986
+(defun tags-loop-eval 1771,71315
+(defun tags-loop-continue 1782,71644
+(defun tags-search 1850,73950
+(defun tags-query-replace 1871,74776
+(defun tags-complete-tags-table-file 1896,76000
+(defun list-tags 1906,76379
+(defun tags-apropos 1934,77332
+(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78158
+(defun select-tags-table 1964,78397
+(defvar select-tags-table-mode-map 2019,80524
+(define-derived-mode select-tags-table-mode 2030,80907
+(defun select-tags-table-select 2034,81091
+(defun select-tags-table-quit 2043,81457
+(defun complete-tag 2049,81612
+(defconst etags--xref-limit 2074,82553
+(defvar etags-xref-find-definitions-tag-order 2076,82588
+(defun etags-xref-find 2082,82878
+(defun etags--xref-find-definitions 2096,83407
+(defclass xref-etags-location 2129,85121
+(defun xref-make-etags-location 2135,85344
+(cl-defmethod xref-location-marker 2139,85499
+(cl-defmethod xref-location-line 2146,85743
 
 erl-src/gs_dialog.erl,98
 -define(VERSION2,32
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index 36edc389617..9dca0084de3 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -2579,73 +2579,73 @@ el-src/emacs/lisp/progmodes/etags.el,5069
 (defun visit-tags-table-buffer 543,22204
 (defun tags-reset-tags-tables 712,28514
 (defun file-of-tag 731,29171
-(defun tags-table-files 740,29520
-(defun tags-included-tables 749,29870
-(defun tags-completion-table 755,30116
-(defun tags-lazy-completion-table 783,31310
-(defun tags-completion-at-point-function 799,31945
-(defun find-tag-tag 818,32695
-(defvar last-tag 837,33368
-(defun find-tag-interactive 840,33427
-(defvar find-tag-history 852,33842
-(defun find-tag-noselect 860,34012
-(defun find-tag 932,37126
-(defun find-tag-other-window 959,38342
-(defun find-tag-other-frame 1000,40270
-(defun find-tag-regexp 1025,41444
-(defalias 'pop-tag-mark pop-tag-mark
1049,42606
-(defvar tag-lines-already-matched 1052,42657
-(defun find-tag-in-order 1055,42764
-(defun tag-find-file-of-tag-noselect 1167,47110
-(defun tag-find-file-of-tag 1200,48956
-(defun etags-recognize-tags-table 1208,49182
-(defun etags-verify-tags-table 1241,50813
-(defun etags-file-of-tag 1246,51011
-(defun etags-tags-completion-table 1256,51346
-(defun etags-snarf-tag 1286,52552
-(defun etags-goto-tag-location 1324,54121
-(defun etags-list-tags 1388,56564
-(defmacro tags-with-face 1423,57839
-(defun etags-tags-apropos-additional 1431,58172
-(defun etags-tags-apropos 1465,59409
-(defun etags-tags-table-files 1527,61618
-(defun etags-tags-included-tables 1542,62054
-(defun tags-recognize-empty-tags-table 1559,62594
-(defun tag-exact-file-name-match-p 1587,63740
-(defun tag-file-name-match-p 1596,64133
-(defun tag-exact-match-p 1609,64689
-(defun tag-implicit-name-match-p 1620,65257
-(defun tag-symbol-match-p 1633,65857
-(defun tag-word-match-p 1643,66293
-(defun tag-partial-file-name-match-p 1652,66691
-(defun tag-any-match-p 1662,67135
-(defun tag-re-match-p 1667,67319
-(defcustom tags-loop-revert-buffers 1675,67568
-(defun next-file 1685,67977
-(defvar tags-loop-operate 1760,70891
-(defvar tags-loop-scan1763,70985
-(defun tags-loop-eval 1771,71314
-(defun tags-loop-continue 1782,71643
-(defun tags-search 1850,73949
-(defun tags-query-replace 1871,74775
-(defun tags-complete-tags-table-file 1896,75999
-(defun list-tags 1906,76378
-(defun tags-apropos 1934,77331
-(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78157
-(defun select-tags-table 1964,78396
-(defvar select-tags-table-mode-map 2019,80523
-(define-derived-mode select-tags-table-mode 2030,80906
-(defun select-tags-table-select 2034,81090
-(defun select-tags-table-quit 2043,81456
-(defun complete-tag 2049,81611
-(defconst etags--xref-limit 2074,82552
-(defvar etags-xref-find-definitions-tag-order 2076,82587
-(defun etags-xref-find 2082,82877
-(defun etags--xref-find-definitions 2096,83406
-(defclass xref-etags-location 2129,85120
-(defun xref-make-etags-location 2135,85343
-(cl-defmethod xref-location-marker 2139,85498
-(cl-defmethod xref-location-line 2146,85742
+(defun tags-table-files 740,29521
+(defun tags-included-tables 749,29871
+(defun tags-completion-table 755,30117
+(defun tags-lazy-completion-table 783,31311
+(defun tags-completion-at-point-function 799,31946
+(defun find-tag-tag 818,32696
+(defvar last-tag 837,33369
+(defun find-tag-interactive 840,33428
+(defvar find-tag-history 852,33843
+(defun find-tag-noselect 860,34013
+(defun find-tag 932,37127
+(defun find-tag-other-window 959,38343
+(defun find-tag-other-frame 1000,40271
+(defun find-tag-regexp 1025,41445
+(defalias 'pop-tag-mark pop-tag-mark
1049,42607
+(defvar tag-lines-already-matched 1052,42658
+(defun find-tag-in-order 1055,42765
+(defun tag-find-file-of-tag-noselect 1167,47111
+(defun tag-find-file-of-tag 1200,48957
+(defun etags-recognize-tags-table 1208,49183
+(defun etags-verify-tags-table 1241,50814
+(defun etags-file-of-tag 1246,51012
+(defun etags-tags-completion-table 1256,51347
+(defun etags-snarf-tag 1286,52553
+(defun etags-goto-tag-location 1324,54122
+(defun etags-list-tags 1388,56565
+(defmacro tags-with-face 1423,57840
+(defun etags-tags-apropos-additional 1431,58173
+(defun etags-tags-apropos 1465,59410
+(defun etags-tags-table-files 1527,61619
+(defun etags-tags-included-tables 1542,62055
+(defun tags-recognize-empty-tags-table 1559,62595
+(defun tag-exact-file-name-match-p 1587,63741
+(defun tag-file-name-match-p 1596,64134
+(defun tag-exact-match-p 1609,64690
+(defun tag-implicit-name-match-p 1620,65258
+(defun tag-symbol-match-p 1633,65858
+(defun tag-word-match-p 1643,66294
+(defun tag-partial-file-name-match-p 1652,66692
+(defun tag-any-match-p 1662,67136
+(defun tag-re-match-p 1667,67320
+(defcustom tags-loop-revert-buffers 1675,67569
+(defun next-file 1685,67978
+(defvar tags-loop-operate 1760,70892
+(defvar tags-loop-scan1763,70986
+(defun tags-loop-eval 1771,71315
+(defun tags-loop-continue 1782,71644
+(defun tags-search 1850,73950
+(defun tags-query-replace 1871,74776
+(defun tags-complete-tags-table-file 1896,76000
+(defun list-tags 1906,76379
+(defun tags-apropos 1934,77332
+(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78158
+(defun select-tags-table 1964,78397
+(defvar select-tags-table-mode-map 2019,80524
+(define-derived-mode select-tags-table-mode 2030,80907
+(defun select-tags-table-select 2034,81091
+(defun select-tags-table-quit 2043,81457
+(defun complete-tag 2049,81612
+(defconst etags--xref-limit 2074,82553
+(defvar etags-xref-find-definitions-tag-order 2076,82588
+(defun etags-xref-find 2082,82878
+(defun etags--xref-find-definitions 2096,83407
+(defclass xref-etags-location 2129,85121
+(defun xref-make-etags-location 2135,85344
+(cl-defmethod xref-location-marker 2139,85499
+(cl-defmethod xref-location-line 2146,85743
 
 erl-src/gs_dialog.erl,98
 -define(VERSION2,32
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index e726a993a91..8527ed726ea 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -2364,73 +2364,73 @@ el-src/emacs/lisp/progmodes/etags.el,5069
 (defun visit-tags-table-buffer 543,22204
 (defun tags-reset-tags-tables 712,28514
 (defun file-of-tag 731,29171
-(defun tags-table-files 740,29520
-(defun tags-included-tables 749,29870
-(defun tags-completion-table 755,30116
-(defun tags-lazy-completion-table 783,31310
-(defun tags-completion-at-point-function 799,31945
-(defun find-tag-tag 818,32695
-(defvar last-tag 837,33368
-(defun find-tag-interactive 840,33427
-(defvar find-tag-history 852,33842
-(defun find-tag-noselect 860,34012
-(defun find-tag 932,37126
-(defun find-tag-other-window 959,38342
-(defun find-tag-other-frame 1000,40270
-(defun find-tag-regexp 1025,41444
-(defalias 'pop-tag-mark pop-tag-mark
1049,42606
-(defvar tag-lines-already-matched 1052,42657
-(defun find-tag-in-order 1055,42764
-(defun tag-find-file-of-tag-noselect 1167,47110
-(defun tag-find-file-of-tag 1200,48956
-(defun etags-recognize-tags-table 1208,49182
-(defun etags-verify-tags-table 1241,50813
-(defun etags-file-of-tag 1246,51011
-(defun etags-tags-completion-table 1256,51346
-(defun etags-snarf-tag 1286,52552
-(defun etags-goto-tag-location 1324,54121
-(defun etags-list-tags 1388,56564
-(defmacro tags-with-face 1423,57839
-(defun etags-tags-apropos-additional 1431,58172
-(defun etags-tags-apropos 1465,59409
-(defun etags-tags-table-files 1527,61618
-(defun etags-tags-included-tables 1542,62054
-(defun tags-recognize-empty-tags-table 1559,62594
-(defun tag-exact-file-name-match-p 1587,63740
-(defun tag-file-name-match-p 1596,64133
-(defun tag-exact-match-p 1609,64689
-(defun tag-implicit-name-match-p 1620,65257
-(defun tag-symbol-match-p 1633,65857
-(defun tag-word-match-p 1643,66293
-(defun tag-partial-file-name-match-p 1652,66691
-(defun tag-any-match-p 1662,67135
-(defun tag-re-match-p 1667,67319
-(defcustom tags-loop-revert-buffers 1675,67568
-(defun next-file 1685,67977
-(defvar tags-loop-operate 1760,70891
-(defvar tags-loop-scan1763,70985
-(defun tags-loop-eval 1771,71314
-(defun tags-loop-continue 1782,71643
-(defun tags-search 1850,73949
-(defun tags-query-replace 1871,74775
-(defun tags-complete-tags-table-file 1896,75999
-(defun list-tags 1906,76378
-(defun tags-apropos 1934,77331
-(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78157
-(defun select-tags-table 1964,78396
-(defvar select-tags-table-mode-map 2019,80523
-(define-derived-mode select-tags-table-mode 2030,80906
-(defun select-tags-table-select 2034,81090
-(defun select-tags-table-quit 2043,81456
-(defun complete-tag 2049,81611
-(defconst etags--xref-limit 2074,82552
-(defvar etags-xref-find-definitions-tag-order 2076,82587
-(defun etags-xref-find 2082,82877
-(defun etags--xref-find-definitions 2096,83406
-(defclass xref-etags-location 2129,85120
-(defun xref-make-etags-location 2135,85343
-(cl-defmethod xref-location-marker 2139,85498
-(cl-defmethod xref-location-line 2146,85742
+(defun tags-table-files 740,29521
+(defun tags-included-tables 749,29871
+(defun tags-completion-table 755,30117
+(defun tags-lazy-completion-table 783,31311
+(defun tags-completion-at-point-function 799,31946
+(defun find-tag-tag 818,32696
+(defvar last-tag 837,33369
+(defun find-tag-interactive 840,33428
+(defvar find-tag-history 852,33843
+(defun find-tag-noselect 860,34013
+(defun find-tag 932,37127
+(defun find-tag-other-window 959,38343
+(defun find-tag-other-frame 1000,40271
+(defun find-tag-regexp 1025,41445
+(defalias 'pop-tag-mark pop-tag-mark
1049,42607
+(defvar tag-lines-already-matched 1052,42658
+(defun find-tag-in-order 1055,42765
+(defun tag-find-file-of-tag-noselect 1167,47111
+(defun tag-find-file-of-tag 1200,48957
+(defun etags-recognize-tags-table 1208,49183
+(defun etags-verify-tags-table 1241,50814
+(defun etags-file-of-tag 1246,51012
+(defun etags-tags-completion-table 1256,51347
+(defun etags-snarf-tag 1286,52553
+(defun etags-goto-tag-location 1324,54122
+(defun etags-list-tags 1388,56565
+(defmacro tags-with-face 1423,57840
+(defun etags-tags-apropos-additional 1431,58173
+(defun etags-tags-apropos 1465,59410
+(defun etags-tags-table-files 1527,61619
+(defun etags-tags-included-tables 1542,62055
+(defun tags-recognize-empty-tags-table 1559,62595
+(defun tag-exact-file-name-match-p 1587,63741
+(defun tag-file-name-match-p 1596,64134
+(defun tag-exact-match-p 1609,64690
+(defun tag-implicit-name-match-p 1620,65258
+(defun tag-symbol-match-p 1633,65858
+(defun tag-word-match-p 1643,66294
+(defun tag-partial-file-name-match-p 1652,66692
+(defun tag-any-match-p 1662,67136
+(defun tag-re-match-p 1667,67320
+(defcustom tags-loop-revert-buffers 1675,67569
+(defun next-file 1685,67978
+(defvar tags-loop-operate 1760,70892
+(defvar tags-loop-scan1763,70986
+(defun tags-loop-eval 1771,71315
+(defun tags-loop-continue 1782,71644
+(defun tags-search 1850,73950
+(defun tags-query-replace 1871,74776
+(defun tags-complete-tags-table-file 1896,76000
+(defun list-tags 1906,76379
+(defun tags-apropos 1934,77332
+(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78158
+(defun select-tags-table 1964,78397
+(defvar select-tags-table-mode-map 2019,80524
+(define-derived-mode select-tags-table-mode 2030,80907
+(defun select-tags-table-select 2034,81091
+(defun select-tags-table-quit 2043,81457
+(defun complete-tag 2049,81612
+(defconst etags--xref-limit 2074,82553
+(defvar etags-xref-find-definitions-tag-order 2076,82588
+(defun etags-xref-find 2082,82878
+(defun etags--xref-find-definitions 2096,83407
+(defclass xref-etags-location 2129,85121
+(defun xref-make-etags-location 2135,85344
+(cl-defmethod xref-location-marker 2139,85499
+(cl-defmethod xref-location-line 2146,85743
 
 erl-src/gs_dialog.erl,98
 -define(VERSION2,32
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 5133cc9e2b5..6d2e44fbfe6 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -3310,76 +3310,76 @@ el-src/emacs/lisp/progmodes/etags.el,5188
 (defun visit-tags-table-buffer 543,22204
 (defun tags-reset-tags-tables 712,28514
 (defun file-of-tag 731,29171
-(defun tags-table-files 740,29520
-(defun tags-included-tables 749,29870
-(defun tags-completion-table 755,30116
-(defun tags-lazy-completion-table 783,31310
-(defun tags-completion-at-point-function 799,31945
-(defun find-tag-tag 818,32695
-(defvar last-tag 837,33368
-(defun find-tag-interactive 840,33427
-(defvar find-tag-history 852,33842
-(defvar etags-case-fold-search)855,33907
-(defvar etags-syntax-table)856,33939
-(defvar local-find-tag-hook)857,33967
-(defun find-tag-noselect 860,34012
-(defun find-tag 932,37126
-(defun find-tag-other-window 959,38342
-(defun find-tag-other-frame 1000,40270
-(defun find-tag-regexp 1025,41444
-(defalias 'pop-tag-mark pop-tag-mark
1049,42606
-(defvar tag-lines-already-matched 1052,42657
-(defun find-tag-in-order 1055,42764
-(defun tag-find-file-of-tag-noselect 1167,47110
-(defun tag-find-file-of-tag 1200,48956
-(defun etags-recognize-tags-table 1208,49182
-(defun etags-verify-tags-table 1241,50813
-(defun etags-file-of-tag 1246,51011
-(defun etags-tags-completion-table 1256,51346
-(defun etags-snarf-tag 1286,52552
-(defun etags-goto-tag-location 1324,54121
-(defun etags-list-tags 1388,56564
-(defmacro tags-with-face 1423,57839
-(defun etags-tags-apropos-additional 1431,58172
-(defun etags-tags-apropos 1465,59409
-(defun etags-tags-table-files 1527,61618
-(defun etags-tags-included-tables 1542,62054
-(defun tags-recognize-empty-tags-table 1559,62594
-(defun tag-exact-file-name-match-p 1587,63740
-(defun tag-file-name-match-p 1596,64133
-(defun tag-exact-match-p 1609,64689
-(defun tag-implicit-name-match-p 1620,65257
-(defun tag-symbol-match-p 1633,65857
-(defun tag-word-match-p 1643,66293
-(defun tag-partial-file-name-match-p 1652,66691
-(defun tag-any-match-p 1662,67135
-(defun tag-re-match-p 1667,67319
-(defcustom tags-loop-revert-buffers 1675,67568
-(defun next-file 1685,67977
-(defvar tags-loop-operate 1760,70891
-(defvar tags-loop-scan1763,70985
-(defun tags-loop-eval 1771,71314
-(defun tags-loop-continue 1782,71643
-(defun tags-search 1850,73949
-(defun tags-query-replace 1871,74775
-(defun tags-complete-tags-table-file 1896,75999
-(defun list-tags 1906,76378
-(defun tags-apropos 1934,77331
-(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78157
-(defun select-tags-table 1964,78396
-(defvar select-tags-table-mode-map 2019,80523
-(define-derived-mode select-tags-table-mode 2030,80906
-(defun select-tags-table-select 2034,81090
-(defun select-tags-table-quit 2043,81456
-(defun complete-tag 2049,81611
-(defconst etags--xref-limit 2074,82552
-(defvar etags-xref-find-definitions-tag-order 2076,82587
-(defun etags-xref-find 2082,82877
-(defun etags--xref-find-definitions 2096,83406
-(defclass xref-etags-location 2129,85120
-(defun xref-make-etags-location 2135,85343
-(cl-defmethod xref-location-marker 2139,85498
-(cl-defmethod xref-location-line 2146,85742
+(defun tags-table-files 740,29521
+(defun tags-included-tables 749,29871
+(defun tags-completion-table 755,30117
+(defun tags-lazy-completion-table 783,31311
+(defun tags-completion-at-point-function 799,31946
+(defun find-tag-tag 818,32696
+(defvar last-tag 837,33369
+(defun find-tag-interactive 840,33428
+(defvar find-tag-history 852,33843
+(defvar etags-case-fold-search)855,33908
+(defvar etags-syntax-table)856,33940
+(defvar local-find-tag-hook)857,33968
+(defun find-tag-noselect 860,34013
+(defun find-tag 932,37127
+(defun find-tag-other-window 959,38343
+(defun find-tag-other-frame 1000,40271
+(defun find-tag-regexp 1025,41445
+(defalias 'pop-tag-mark pop-tag-mark
1049,42607
+(defvar tag-lines-already-matched 1052,42658
+(defun find-tag-in-order 1055,42765
+(defun tag-find-file-of-tag-noselect 1167,47111
+(defun tag-find-file-of-tag 1200,48957
+(defun etags-recognize-tags-table 1208,49183
+(defun etags-verify-tags-table 1241,50814
+(defun etags-file-of-tag 1246,51012
+(defun etags-tags-completion-table 1256,51347
+(defun etags-snarf-tag 1286,52553
+(defun etags-goto-tag-location 1324,54122
+(defun etags-list-tags 1388,56565
+(defmacro tags-with-face 1423,57840
+(defun etags-tags-apropos-additional 1431,58173
+(defun etags-tags-apropos 1465,59410
+(defun etags-tags-table-files 1527,61619
+(defun etags-tags-included-tables 1542,62055
+(defun tags-recognize-empty-tags-table 1559,62595
+(defun tag-exact-file-name-match-p 1587,63741
+(defun tag-file-name-match-p 1596,64134
+(defun tag-exact-match-p 1609,64690
+(defun tag-implicit-name-match-p 1620,65258
+(defun tag-symbol-match-p 1633,65858
+(defun tag-word-match-p 1643,66294
+(defun tag-partial-file-name-match-p 1652,66692
+(defun tag-any-match-p 1662,67136
+(defun tag-re-match-p 1667,67320
+(defcustom tags-loop-revert-buffers 1675,67569
+(defun next-file 1685,67978
+(defvar tags-loop-operate 1760,70892
+(defvar tags-loop-scan1763,70986
+(defun tags-loop-eval 1771,71315
+(defun tags-loop-continue 1782,71644
+(defun tags-search 1850,73950
+(defun tags-query-replace 1871,74776
+(defun tags-complete-tags-table-file 1896,76000
+(defun list-tags 1906,76379
+(defun tags-apropos 1934,77332
+(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78158
+(defun select-tags-table 1964,78397
+(defvar select-tags-table-mode-map 2019,80524
+(define-derived-mode select-tags-table-mode 2030,80907
+(defun select-tags-table-select 2034,81091
+(defun select-tags-table-quit 2043,81457
+(defun complete-tag 2049,81612
+(defconst etags--xref-limit 2074,82553
+(defvar etags-xref-find-definitions-tag-order 2076,82588
+(defun etags-xref-find 2082,82878
+(defun etags--xref-find-definitions 2096,83407
+(defclass xref-etags-location 2129,85121
+(defun xref-make-etags-location 2135,85344
+(cl-defmethod xref-location-marker 2139,85499
+(cl-defmethod xref-location-line 2146,85743
 
 erl-src/gs_dialog.erl,98
 -define(VERSION2,32
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 75047951a8a..9a38e20dcea 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -3310,76 +3310,76 @@ el-src/emacs/lisp/progmodes/etags.el,5188
 (defun visit-tags-table-buffer 543,22204
 (defun tags-reset-tags-tables 712,28514
 (defun file-of-tag 731,29171
-(defun tags-table-files 740,29520
-(defun tags-included-tables 749,29870
-(defun tags-completion-table 755,30116
-(defun tags-lazy-completion-table 783,31310
-(defun tags-completion-at-point-function 799,31945
-(defun find-tag-tag 818,32695
-(defvar last-tag 837,33368
-(defun find-tag-interactive 840,33427
-(defvar find-tag-history 852,33842
-(defvar etags-case-fold-search)855,33907
-(defvar etags-syntax-table)856,33939
-(defvar local-find-tag-hook)857,33967
-(defun find-tag-noselect 860,34012
-(defun find-tag 932,37126
-(defun find-tag-other-window 959,38342
-(defun find-tag-other-frame 1000,40270
-(defun find-tag-regexp 1025,41444
-(defalias 'pop-tag-mark pop-tag-mark
1049,42606
-(defvar tag-lines-already-matched 1052,42657
-(defun find-tag-in-order 1055,42764
-(defun tag-find-file-of-tag-noselect 1167,47110
-(defun tag-find-file-of-tag 1200,48956
-(defun etags-recognize-tags-table 1208,49182
-(defun etags-verify-tags-table 1241,50813
-(defun etags-file-of-tag 1246,51011
-(defun etags-tags-completion-table 1256,51346
-(defun etags-snarf-tag 1286,52552
-(defun etags-goto-tag-location 1324,54121
-(defun etags-list-tags 1388,56564
-(defmacro tags-with-face 1423,57839
-(defun etags-tags-apropos-additional 1431,58172
-(defun etags-tags-apropos 1465,59409
-(defun etags-tags-table-files 1527,61618
-(defun etags-tags-included-tables 1542,62054
-(defun tags-recognize-empty-tags-table 1559,62594
-(defun tag-exact-file-name-match-p 1587,63740
-(defun tag-file-name-match-p 1596,64133
-(defun tag-exact-match-p 1609,64689
-(defun tag-implicit-name-match-p 1620,65257
-(defun tag-symbol-match-p 1633,65857
-(defun tag-word-match-p 1643,66293
-(defun tag-partial-file-name-match-p 1652,66691
-(defun tag-any-match-p 1662,67135
-(defun tag-re-match-p 1667,67319
-(defcustom tags-loop-revert-buffers 1675,67568
-(defun next-file 1685,67977
-(defvar tags-loop-operate 1760,70891
-(defvar tags-loop-scan1763,70985
-(defun tags-loop-eval 1771,71314
-(defun tags-loop-continue 1782,71643
-(defun tags-search 1850,73949
-(defun tags-query-replace 1871,74775
-(defun tags-complete-tags-table-file 1896,75999
-(defun list-tags 1906,76378
-(defun tags-apropos 1934,77331
-(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78157
-(defun select-tags-table 1964,78396
-(defvar select-tags-table-mode-map 2019,80523
-(define-derived-mode select-tags-table-mode 2030,80906
-(defun select-tags-table-select 2034,81090
-(defun select-tags-table-quit 2043,81456
-(defun complete-tag 2049,81611
-(defconst etags--xref-limit 2074,82552
-(defvar etags-xref-find-definitions-tag-order 2076,82587
-(defun etags-xref-find 2082,82877
-(defun etags--xref-find-definitions 2096,83406
-(defclass xref-etags-location 2129,85120
-(defun xref-make-etags-location 2135,85343
-(cl-defmethod xref-location-marker 2139,85498
-(cl-defmethod xref-location-line 2146,85742
+(defun tags-table-files 740,29521
+(defun tags-included-tables 749,29871
+(defun tags-completion-table 755,30117
+(defun tags-lazy-completion-table 783,31311
+(defun tags-completion-at-point-function 799,31946
+(defun find-tag-tag 818,32696
+(defvar last-tag 837,33369
+(defun find-tag-interactive 840,33428
+(defvar find-tag-history 852,33843
+(defvar etags-case-fold-search)855,33908
+(defvar etags-syntax-table)856,33940
+(defvar local-find-tag-hook)857,33968
+(defun find-tag-noselect 860,34013
+(defun find-tag 932,37127
+(defun find-tag-other-window 959,38343
+(defun find-tag-other-frame 1000,40271
+(defun find-tag-regexp 1025,41445
+(defalias 'pop-tag-mark pop-tag-mark
1049,42607
+(defvar tag-lines-already-matched 1052,42658
+(defun find-tag-in-order 1055,42765
+(defun tag-find-file-of-tag-noselect 1167,47111
+(defun tag-find-file-of-tag 1200,48957
+(defun etags-recognize-tags-table 1208,49183
+(defun etags-verify-tags-table 1241,50814
+(defun etags-file-of-tag 1246,51012
+(defun etags-tags-completion-table 1256,51347
+(defun etags-snarf-tag 1286,52553
+(defun etags-goto-tag-location 1324,54122
+(defun etags-list-tags 1388,56565
+(defmacro tags-with-face 1423,57840
+(defun etags-tags-apropos-additional 1431,58173
+(defun etags-tags-apropos 1465,59410
+(defun etags-tags-table-files 1527,61619
+(defun etags-tags-included-tables 1542,62055
+(defun tags-recognize-empty-tags-table 1559,62595
+(defun tag-exact-file-name-match-p 1587,63741
+(defun tag-file-name-match-p 1596,64134
+(defun tag-exact-match-p 1609,64690
+(defun tag-implicit-name-match-p 1620,65258
+(defun tag-symbol-match-p 1633,65858
+(defun tag-word-match-p 1643,66294
+(defun tag-partial-file-name-match-p 1652,66692
+(defun tag-any-match-p 1662,67136
+(defun tag-re-match-p 1667,67320
+(defcustom tags-loop-revert-buffers 1675,67569
+(defun next-file 1685,67978
+(defvar tags-loop-operate 1760,70892
+(defvar tags-loop-scan1763,70986
+(defun tags-loop-eval 1771,71315
+(defun tags-loop-continue 1782,71644
+(defun tags-search 1850,73950
+(defun tags-query-replace 1871,74776
+(defun tags-complete-tags-table-file 1896,76000
+(defun list-tags 1906,76379
+(defun tags-apropos 1934,77332
+(define-button-type 'tags-select-tags-tabletags-select-tags-table
1957,78158
+(defun select-tags-table 1964,78397
+(defvar select-tags-table-mode-map 2019,80524
+(define-derived-mode select-tags-table-mode 2030,80907
+(defun select-tags-table-select 2034,81091
+(defun select-tags-table-quit 2043,81457
+(defun complete-tag 2049,81612
+(defconst etags--xref-limit 2074,82553
+(defvar etags-xref-find-definitions-tag-order 2076,82588
+(defun etags-xref-find 2082,82878
+(defun etags--xref-find-definitions 2096,83407
+(defclass xref-etags-location 2129,85121
+(defun xref-make-etags-location 2135,85344
+(cl-defmethod xref-location-marker 2139,85499
+(cl-defmethod xref-location-line 2146,85743
 
 erl-src/gs_dialog.erl,98
 -define(VERSION2,32
diff --git a/test/manual/etags/c-src/abbrev.c b/test/manual/etags/c-src/abbrev.c
index 039addc5a30..301ca4e9d81 100644
--- a/test/manual/etags/c-src/abbrev.c
+++ b/test/manual/etags/c-src/abbrev.c
@@ -1,5 +1,5 @@
 /* Primitives for word-abbrev mode.
-   Copyright (C) 1985-1986, 1993, 1996, 1998, 2016-2021 Free Software
+   Copyright (C) 1985-1986, 1993, 1996, 1998, 2016-2022 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/test/manual/etags/c-src/emacs/src/gmalloc.c b/test/manual/etags/c-src/emacs/src/gmalloc.c
index f56a243465b..0a28d0c6d37 100644
--- a/test/manual/etags/c-src/emacs/src/gmalloc.c
+++ b/test/manual/etags/c-src/emacs/src/gmalloc.c
@@ -1,5 +1,5 @@
 /* Declarations for `malloc' and friends.
-   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2021 Free
+   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2022 Free
    Software Foundation, Inc.
 		  Written May 1989 by Mike Haertel.
 
diff --git a/test/manual/etags/c-src/emacs/src/keyboard.c b/test/manual/etags/c-src/emacs/src/keyboard.c
index db86515ef09..7228f8cb5dc 100644
--- a/test/manual/etags/c-src/emacs/src/keyboard.c
+++ b/test/manual/etags/c-src/emacs/src/keyboard.c
@@ -1,6 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
 
-Copyright (C) 1985-1989, 1993-1997, 1999-2021 Free Software Foundation,
+Copyright (C) 1985-1989, 1993-1997, 1999-2022 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff --git a/test/manual/etags/c-src/emacs/src/lisp.h b/test/manual/etags/c-src/emacs/src/lisp.h
index e2744a1bf3e..1fe50f5f93f 100644
--- a/test/manual/etags/c-src/emacs/src/lisp.h
+++ b/test/manual/etags/c-src/emacs/src/lisp.h
@@ -1,6 +1,6 @@
 /* Fundamental definitions for GNU Emacs Lisp interpreter.
 
-Copyright (C) 1985-1987, 1993-1995, 1997-2021 Free Software Foundation,
+Copyright (C) 1985-1987, 1993-1995, 1997-2022 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff --git a/test/manual/etags/c-src/emacs/src/regex.h b/test/manual/etags/c-src/emacs/src/regex.h
index 3e871303ea2..f51e4fc594b 100644
--- a/test/manual/etags/c-src/emacs/src/regex.h
+++ b/test/manual/etags/c-src/emacs/src/regex.h
@@ -1,7 +1,7 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
-   Copyright (C) 1985, 1989-1993, 1995, 2000-2021 Free Software
+   Copyright (C) 1985, 1989-1993, 1995, 2000-2022 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/test/manual/etags/c-src/etags.c b/test/manual/etags/c-src/etags.c
index 7105ad5cba5..efa269d81cf 100644
--- a/test/manual/etags/c-src/etags.c
+++ b/test/manual/etags/c-src/etags.c
@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2021 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2022 Free Software
 Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
diff --git a/test/manual/etags/c-src/exit.c b/test/manual/etags/c-src/exit.c
index 93b3563d832..c655b257c9b 100644
--- a/test/manual/etags/c-src/exit.c
+++ b/test/manual/etags/c-src/exit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 2016-2021 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 2016-2022 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
diff --git a/test/manual/etags/c-src/exit.strange_suffix b/test/manual/etags/c-src/exit.strange_suffix
index 93b3563d832..c655b257c9b 100644
--- a/test/manual/etags/c-src/exit.strange_suffix
+++ b/test/manual/etags/c-src/exit.strange_suffix
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 2016-2021 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 2016-2022 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
diff --git a/test/manual/etags/c-src/getopt.h b/test/manual/etags/c-src/getopt.h
index ec74c836f10..31e2a03c12d 100644
--- a/test/manual/etags/c-src/getopt.h
+++ b/test/manual/etags/c-src/getopt.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1992, 2016-2021 Free Software Foundation, Inc.
+   Copyright (C) 1989-1992, 2016-2022 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff --git a/test/manual/etags/c-src/sysdep.h b/test/manual/etags/c-src/sysdep.h
index 187692f5c7c..38edc43df3b 100644
--- a/test/manual/etags/c-src/sysdep.h
+++ b/test/manual/etags/c-src/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-1993, 2016-2021 Free Software Foundation, Inc.
+/* Copyright (C) 1992-1993, 2016-2022 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
diff --git a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
index 86cc8825466..e589263dc3f 100644
--- a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
+++ b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
@@ -1,6 +1,6 @@
 ;;; etags.el --- etags facility for Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2021 Free
+;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2022 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
diff --git a/test/manual/etags/tex-src/texinfo.tex b/test/manual/etags/tex-src/texinfo.tex
index a04371d1c90..e0de6afe96e 100644
--- a/test/manual/etags/tex-src/texinfo.tex
+++ b/test/manual/etags/tex-src/texinfo.tex
@@ -1,6 +1,6 @@
 %% TeX macros to handle texinfo files
 
-%   Copyright (C) 1985--1986, 1988, 1990--1991, 2016--2021 Free Software
+%   Copyright (C) 1985--1986, 1988, 1990--1991, 2016--2022 Free Software
 %   Foundation, Inc.
 
 %This texinfo.tex file is free software; you can redistribute it and/or
diff --git a/test/manual/etags/y-src/cccp.c b/test/manual/etags/y-src/cccp.c
index 7156414b64e..264adfae663 100644
--- a/test/manual/etags/y-src/cccp.c
+++ b/test/manual/etags/y-src/cccp.c
@@ -320,7 +320,7 @@ static const short yycheck[] =
 #line 3 "/usr/share/bison/bison.simple"
 
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989-1990, 2000-2001, 2016-2021 Free Software
+   Copyright (C) 1984, 1989-1990, 2000-2001, 2016-2022 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/test/manual/etags/y-src/parse.c b/test/manual/etags/y-src/parse.c
index f90d31505f0..61794f713ed 100644
--- a/test/manual/etags/y-src/parse.c
+++ b/test/manual/etags/y-src/parse.c
@@ -28,7 +28,7 @@
 
 #line 1 "y-src/parse.y"
 
-/*	Copyright (C) 1990, 1992-1993, 2016-2021 Free Software Foundation,
+/*	Copyright (C) 1990, 1992-1993, 2016-2022 Free Software Foundation,
  *	Inc.
 
 This file is part of Oleo, the GNU Spreadsheet.
diff --git a/test/manual/etags/y-src/parse.y b/test/manual/etags/y-src/parse.y
index 7985da525be..0bfa92b6303 100644
--- a/test/manual/etags/y-src/parse.y
+++ b/test/manual/etags/y-src/parse.y
@@ -1,5 +1,5 @@
 %{
-/*	Copyright (C) 1990, 1992-1993, 2016-2021 Free Software Foundation,
+/*	Copyright (C) 1990, 1992-1993, 2016-2022 Free Software Foundation,
  *	Inc.
 
 This file is part of Oleo, the GNU Spreadsheet.
diff --git a/test/manual/image-circular-tests.el b/test/manual/image-circular-tests.el
index 7abb94dee6e..edc65eee9b8 100644
--- a/test/manual/image-circular-tests.el
+++ b/test/manual/image-circular-tests.el
@@ -1,6 +1,6 @@
 ;;; image-circular-tests.el --- test image functions with circular objects  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2019, 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2019, 2021-2022 Free Software Foundation, Inc.
 
 ;; Author: Pip Cet <pipcet@gmail.com>
 ;; Keywords:       internal
diff --git a/test/manual/image-size-tests.el b/test/manual/image-size-tests.el
index 067a0bfc8e2..ea7af889431 100644
--- a/test/manual/image-size-tests.el
+++ b/test/manual/image-size-tests.el
@@ -1,6 +1,6 @@
 ;;; image-size-tests.el --- tests for image scaling  -*- 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/manual/image-transforms-tests.el b/test/manual/image-transforms-tests.el
index acbaed5c0b6..2f03073ab74 100644
--- a/test/manual/image-transforms-tests.el
+++ b/test/manual/image-transforms-tests.el
@@ -1,6 +1,6 @@
 ;;; image-transforms-tests.el --- Test suite for image transforms.  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2019-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2022 Free Software Foundation, Inc.
 
 ;; Author: Alan Third <alan@idiocy.org>
 ;; Keywords:       internal
diff --git a/test/manual/indent/pascal.pas b/test/manual/indent/pascal.pas
index a166eedbc5d..1efd9b83752 100644
--- a/test/manual/indent/pascal.pas
+++ b/test/manual/indent/pascal.pas
@@ -1,6 +1,6 @@
 { GPC demo program for the CRT unit.
 
-Copyright (C) 1999-2006, 2013-2021 Free Software Foundation, Inc.
+Copyright (C) 1999-2006, 2013-2022 Free Software Foundation, Inc.
 
 Author: Frank Heckenbach <frank@pascal.gnu.de>
 
diff --git a/test/manual/redisplay-testsuite.el b/test/manual/redisplay-testsuite.el
index 8a4828417c8..01b0a895a42 100644
--- a/test/manual/redisplay-testsuite.el
+++ b/test/manual/redisplay-testsuite.el
@@ -1,6 +1,6 @@
 ;;; redisplay-testsuite.el --- Test suite for redisplay.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2022 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/manual/scroll-tests.el b/test/manual/scroll-tests.el
index dd15d54fa88..e4a9e7cd6f3 100644
--- a/test/manual/scroll-tests.el
+++ b/test/manual/scroll-tests.el
@@ -1,6 +1,6 @@
 ;;; scroll-tests.el --- tests for scrolling -*- 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.