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 /admin/notes | |
| 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 'admin/notes')
| -rw-r--r-- | admin/notes/copyright | 2 | ||||
| -rw-r--r-- | admin/notes/emba | 2 | ||||
| -rw-r--r-- | admin/notes/hydra | 2 | ||||
| -rw-r--r-- | admin/notes/multi-tty | 2 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Accessing-Node.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Language-Definitions.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Multiple-Languages.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Pattern-Matching.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Retrieving-Node.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Using-Parser.html | 3 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/manual.css | 2 | ||||
| -rw-r--r-- | admin/notes/unicode | 2 | ||||
| -rw-r--r-- | admin/notes/www | 2 | ||||
| -rw-r--r-- | admin/notes/years | 7 |
18 files changed, 21 insertions, 30 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index 6f7cb153345..ae09707bac8 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2007-2022 Free Software Foundation, Inc. | 1 | Copyright (C) 2007-2023 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/notes/emba b/admin/notes/emba index 4c8c27dfeaa..564cc3c54ac 100644 --- a/admin/notes/emba +++ b/admin/notes/emba | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- mode: outline; coding: utf-8 -*- | 1 | -*- mode: outline; coding: utf-8 -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2019-2022 Free Software Foundation, Inc. | 3 | Copyright (C) 2019-2023 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS CONTINUOUS BUILD ON EMBA | 6 | NOTES FOR EMACS CONTINUOUS BUILD ON EMBA |
diff --git a/admin/notes/hydra b/admin/notes/hydra index 0987e7be820..12d3f356020 100644 --- a/admin/notes/hydra +++ b/admin/notes/hydra | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- mode: outline; coding: utf-8 -*- | 1 | -*- mode: outline; coding: utf-8 -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2013-2022 Free Software Foundation, Inc. | 3 | Copyright (C) 2013-2023 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA | 6 | NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA |
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 84bc1b77d4e..d0b63f166fd 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- coding: utf-8; mode: text; -*- | 1 | -*- coding: utf-8; mode: text; -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2007-2022 Free Software Foundation, Inc. | 3 | Copyright (C) 2007-2023 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | From README.multi-tty in the multi-tty branch. | 6 | From README.multi-tty in the multi-tty branch. |
diff --git a/admin/notes/tree-sitter/html-manual/Accessing-Node.html b/admin/notes/tree-sitter/html-manual/Accessing-Node.html index 00ac63b8339..9e7a4b68299 100644 --- a/admin/notes/tree-sitter/html-manual/Accessing-Node.html +++ b/admin/notes/tree-sitter/html-manual/Accessing-Node.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Language-Definitions.html b/admin/notes/tree-sitter/html-manual/Language-Definitions.html index 6dd589f8259..6c17e8c3344 100644 --- a/admin/notes/tree-sitter/html-manual/Language-Definitions.html +++ b/admin/notes/tree-sitter/html-manual/Language-Definitions.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html index 46985649a82..65507687d51 100644 --- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html +++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html index e04a730b05c..670f235bd20 100644 --- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html +++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html index 1d48398bbce..cf1257f3102 100644 --- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html +++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html index a0b5775f11f..58f6b4e9d5a 100644 --- a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html +++ b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Pattern-Matching.html b/admin/notes/tree-sitter/html-manual/Pattern-Matching.html index 21eb4702b12..9ef536b79dd 100644 --- a/admin/notes/tree-sitter/html-manual/Pattern-Matching.html +++ b/admin/notes/tree-sitter/html-manual/Pattern-Matching.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Retrieving-Node.html b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html index 0c086dab91d..58e87e8df7f 100644 --- a/admin/notes/tree-sitter/html-manual/Retrieving-Node.html +++ b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html index 29d51eecf73..0c827b3e755 100644 --- a/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html +++ b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/Using-Parser.html b/admin/notes/tree-sitter/html-manual/Using-Parser.html index a4f31f90897..fd8fc482f46 100644 --- a/admin/notes/tree-sitter/html-manual/Using-Parser.html +++ b/admin/notes/tree-sitter/html-manual/Using-Parser.html | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | <!-- This is the GNU Emacs Lisp Reference Manual | 6 | <!-- This is the GNU Emacs Lisp Reference Manual |
| 7 | corresponding to Emacs version 29.0.50. | 7 | corresponding to Emacs version 29.0.50. |
| 8 | 8 | ||
| 9 | Copyright © 1990-1996, 1998-2022 Free Software Foundation, | 9 | Copyright © 1990-1996, 1998-2023 Free Software Foundation, Inc. |
| 10 | Inc. | ||
| 11 | 10 | ||
| 12 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| 13 | under the terms of the GNU Free Documentation License, Version 1.3 or | 12 | under the terms of the GNU Free Documentation License, Version 1.3 or |
diff --git a/admin/notes/tree-sitter/html-manual/manual.css b/admin/notes/tree-sitter/html-manual/manual.css index 5a6790a3458..c03e0d37009 100644 --- a/admin/notes/tree-sitter/html-manual/manual.css +++ b/admin/notes/tree-sitter/html-manual/manual.css | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Style-sheet to use for Emacs manuals */ | 1 | /* Style-sheet to use for Emacs manuals */ |
| 2 | 2 | ||
| 3 | /* Copyright (C) 2013-2014 Free Software Foundation, Inc. | 3 | /* Copyright (C) 2013-2014, 2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | Copying and distribution of this file, with or without modification, | 5 | Copying and distribution of this file, with or without modification, |
| 6 | are permitted in any medium without royalty provided the copyright | 6 | are permitted in any medium without royalty provided the copyright |
diff --git a/admin/notes/unicode b/admin/notes/unicode index 014bfb9b0d5..0e000365da7 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*-mode: text; coding: utf-8;-*- | 1 | -*-mode: text; coding: utf-8;-*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2002-2022 Free Software Foundation, Inc. | 3 | Copyright (C) 2002-2023 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | Importing a new Unicode Standard version into Emacs | 6 | Importing a new Unicode Standard version into Emacs |
diff --git a/admin/notes/www b/admin/notes/www index d1a8f0637ff..d6e15ffe955 100644 --- a/admin/notes/www +++ b/admin/notes/www | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- outline -*- | 1 | -*- outline -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2013-2022 Free Software Foundation, Inc. | 3 | Copyright (C) 2013-2023 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS WWW PAGES | 6 | NOTES FOR EMACS WWW PAGES |
diff --git a/admin/notes/years b/admin/notes/years index 3df8139f9b9..113e6608d3f 100644 --- a/admin/notes/years +++ b/admin/notes/years | |||
| @@ -10,9 +10,10 @@ results for plausibility, then commit them. | |||
| 10 | A few known problems with the build-aux/update-copyright script: | 10 | A few known problems with the build-aux/update-copyright script: |
| 11 | 11 | ||
| 12 | . it doesn't update config.bat, msdos/depfiles.bat, | 12 | . it doesn't update config.bat, msdos/depfiles.bat, |
| 13 | nt/configure.bat, etc/tutorials/TUTORIAL.cn, and | 13 | nt/configure.bat, etc/tutorials/TUTORIAL.cn, |
| 14 | etc/tutorials/TUTORIAL.he because the "Copyright" statement begins | 14 | etc/tutorials/TUTORIAL.el_GR, and etc/tutorials/TUTORIAL.he |
| 15 | in these files after a prefix that is more than 5 characters long | 15 | because the "Copyright" statement begins in these files |
| 16 | after a prefix that is more than 5 characters long | ||
| 16 | . it doesn't update etc/tutorials/TUTORIAL.nl and | 17 | . it doesn't update etc/tutorials/TUTORIAL.nl and |
| 17 | etc/tutorials/TUTORIAL.ro for some reason | 18 | etc/tutorials/TUTORIAL.ro for some reason |
| 18 | . it doesn't update the second Copyright notice, the one that gets | 19 | . it doesn't update the second Copyright notice, the one that gets |