diff options
| author | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
| commit | 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 (patch) | |
| tree | bc5715fea2ff0ae8830afdee165dcaa22344f159 /etc/srecode | |
| parent | df192b5153f9d0c9b371f28f6460a038cba8a987 (diff) | |
| parent | cae528457cb862dc886a34240c9d4c73035b6659 (diff) | |
| download | emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.tar.gz emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.zip | |
Merge from origin/emacs-29
cae528457c ; Add 2023 to copyright years.
b394359261 Improve documentation of 'isearch-open-overlay-temporary'
ab3210e709 Document 'use-package' in the 2 main manuals
# Conflicts:
# etc/refcards/ru-refcard.tex
# lib/explicit_bzero.c
# m4/explicit_bzero.m4
Diffstat (limited to 'etc/srecode')
| -rw-r--r-- | etc/srecode/c.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/cpp.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/default.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/doc-cpp.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/doc-default.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/doc-java.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/ede-autoconf.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/ede-make.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/el.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/getset-cpp.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/java.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/make.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/proj-test.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/template.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/test.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/texi.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/wisent.srt | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt index e36caef307e..398e9b559b3 100644 --- a/etc/srecode/c.srt +++ b/etc/srecode/c.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; c.srt --- SRecode templates for c-mode | 1 | ;;; c.srt --- SRecode templates for c-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2010, 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2010, 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt index d35adaf4b70..ad8618b51be 100644 --- a/etc/srecode/cpp.srt +++ b/etc/srecode/cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cpp.srt --- SRecode templates for c++-mode | 1 | ;;; cpp.srt --- SRecode templates for c++-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt index 04ca2e30230..d07f7abf562 100644 --- a/etc/srecode/default.srt +++ b/etc/srecode/default.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; default.srt --- SRecode templates for srecode-template-mode | 1 | ;;; default.srt --- SRecode templates for srecode-template-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index e11623dc048..ea2370e089d 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-c.srt --- SRecode templates for "document" applications | 1 | ;; doc-c.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index edd18c26fcc..cbaa599147d 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-default.srt --- SRecode templates for "document" applications | 1 | ;; doc-default.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index a94392b6738..a1015572507 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-java.srt --- SRecode templates for "document" applications | 1 | ;; doc-java.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt index 51656eb73c4..833cd6359ea 100644 --- a/etc/srecode/ede-autoconf.srt +++ b/etc/srecode/ede-autoconf.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE | 1 | ;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010, 2012-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010, 2012-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index c01054e0420..5f16dfc9baa 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; ede-make.srt --- SRecode templates for Makefiles used by EDE. | 1 | ;; ede-make.srt --- SRecode templates for Makefiles used by EDE. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 9078f4d334b..44c7aff6d7e 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; el.srt --- SRecode templates for Emacs Lisp mode | 1 | ;;; el.srt --- SRecode templates for Emacs Lisp mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt index f53b4101264..f000680ab40 100644 --- a/etc/srecode/getset-cpp.srt +++ b/etc/srecode/getset-cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters. | 1 | ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt index 5c4f7d80727..23210b85dfa 100644 --- a/etc/srecode/java.srt +++ b/etc/srecode/java.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; java.srt | 1 | ;; java.srt |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt index 436e067c500..8857de87b5a 100644 --- a/etc/srecode/make.srt +++ b/etc/srecode/make.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; make.srt | 1 | ;; make.srt |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/proj-test.srt b/etc/srecode/proj-test.srt index 62eb0befdfb..b8469542119 100644 --- a/etc/srecode/proj-test.srt +++ b/etc/srecode/proj-test.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; proj-test.srt --- SRecode template for testing project scoping. | 1 | ;; proj-test.srt --- SRecode template for testing project scoping. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt index b6590f5f0b9..ded8ce3f705 100644 --- a/etc/srecode/template.srt +++ b/etc/srecode/template.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; template.srt --- Templates for Semantic Recoders | 1 | ;;; template.srt --- Templates for Semantic Recoders |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005, 2007-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005, 2007-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt index 186376b58a6..127c4f47672 100644 --- a/etc/srecode/test.srt +++ b/etc/srecode/test.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; test.srt --- SRecode templates for testing | 1 | ;; test.srt --- SRecode templates for testing |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt index 611ef65a8cb..4a0a20a2267 100644 --- a/etc/srecode/texi.srt +++ b/etc/srecode/texi.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; texi.srt --- SRecode templates for Texinfo | 1 | ;; texi.srt --- SRecode templates for Texinfo |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index 83553c3dca0..e42ca5c979c 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files. | 1 | ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2022 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | 6 | ||