Skip to content

Commit ecf08f0

Browse files
author
Po Lu
committed
Merge from savannah/emacs-29
dc4e6b1 ; Update copyright years in more files 64b3777 ; Run set-copyright from admin.el 8e1c56a ; Add 2024 to copyright years # Conflicts: # doc/misc/modus-themes.org # doc/misc/texinfo.tex # etc/NEWS # etc/refcards/ru-refcard.tex # etc/themes/modus-operandi-theme.el # etc/themes/modus-themes.el # etc/themes/modus-vivendi-theme.el # lib/alloca.in.h # lib/binary-io.h # lib/c-ctype.h # lib/c-strcasecmp.c # lib/c-strncasecmp.c # lib/careadlinkat.c # lib/cloexec.c # lib/close-stream.c # lib/diffseq.h # lib/dup2.c # lib/filemode.h # lib/fpending.c # lib/fpending.h # lib/fsusage.c # lib/getgroups.c # lib/getloadavg.c # lib/gettext.h # lib/gettime.c # lib/gettimeofday.c # lib/group-member.c # lib/malloc.c # lib/md5-stream.c # lib/md5.c # lib/md5.h # lib/memmem.c # lib/memrchr.c # lib/nanosleep.c # lib/save-cwd.h # lib/sha1.c # lib/sig2str.c # lib/stdlib.in.h # lib/strtoimax.c # lib/strtol.c # lib/strtoll.c # lib/time_r.c # lib/xalloc-oversized.h # lisp/auth-source-pass.el # lisp/emacs-lisp/lisp-mnt.el # lisp/emacs-lisp/timer.el # lisp/info-look.el # lisp/jit-lock.el # lisp/loadhist.el # lisp/mail/rmail.el # lisp/net/ntlm.el # lisp/net/webjump.el # lisp/progmodes/asm-mode.el # lisp/progmodes/project.el # lisp/progmodes/sh-script.el # lisp/textmodes/flyspell.el # lisp/textmodes/reftex-toc.el # lisp/textmodes/reftex.el # lisp/textmodes/tex-mode.el # lisp/url/url-gw.el # m4/alloca.m4 # m4/clock_time.m4 # m4/d-type.m4 # m4/dirent_h.m4 # m4/dup2.m4 # m4/euidaccess.m4 # m4/fchmodat.m4 # m4/filemode.m4 # m4/fsusage.m4 # m4/getgroups.m4 # m4/getloadavg.m4 # m4/getrandom.m4 # m4/gettime.m4 # m4/gettimeofday.m4 # m4/gnulib-common.m4 # m4/group-member.m4 # m4/inttypes.m4 # m4/malloc.m4 # m4/manywarnings.m4 # m4/mempcpy.m4 # m4/memrchr.m4 # m4/mkostemp.m4 # m4/mktime.m4 # m4/nproc.m4 # m4/nstrftime.m4 # m4/pathmax.m4 # m4/pipe2.m4 # m4/pselect.m4 # m4/pthread_sigmask.m4 # m4/readlink.m4 # m4/realloc.m4 # m4/sig2str.m4 # m4/ssize_t.m4 # m4/stat-time.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/stdio_h.m4 # m4/stdlib_h.m4 # m4/stpcpy.m4 # m4/strnlen.m4 # m4/strtoimax.m4 # m4/strtoll.m4 # m4/time_h.m4 # m4/timegm.m4 # m4/timer_time.m4 # m4/timespec.m4 # m4/unistd_h.m4 # m4/warnings.m4 # nt/configure.bat # nt/preprep.c # test/lisp/register-tests.el
2 parents 083e90d + dc4e6b1 commit ecf08f0

File tree

3,181 files changed

+4131
-3198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,181 files changed

+4131
-3198
lines changed

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Attributes of Emacs files in the Git repository.
22

3-
# Copyright 2015-2023 Free Software Foundation, Inc.
3+
# Copyright 2015-2024 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Files that Git should ignore in the Emacs source directory.
22

3-
# Copyright 2009-2023 Free Software Foundation, Inc.
3+
# Copyright 2009-2024 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2021-2023 Free Software Foundation, Inc.
1+
# Copyright (C) 2021-2024 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Emacs.
44
#

‎CONTRIBUTE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2006-2023 Free Software Foundation, Inc.
1+
Copyright (C) 2006-2024 Free Software Foundation, Inc.
22
See the end of the file for license conditions.
33

44
* How developers contribute to GNU Emacs

‎ChangeLog.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -14700,7 +14700,7 @@
1470014700
;; coding: utf-8
1470114701
;; End:
1470214702

14703-
Copyright (C) 1993-1999, 2001-2023 Free Software Foundation, Inc.
14703+
Copyright (C) 1993-1999, 2001-2024 Free Software Foundation, Inc.
1470414704

1470514705
This file is part of GNU Emacs.
1470614706

‎ChangeLog.2

+1-1
Original file line numberDiff line numberDiff line change
@@ -35788,7 +35788,7 @@ See ChangeLog.1 for earlier changes.
3578835788
;; coding: utf-8
3578935789
;; End:
3579035790

35791-
Copyright (C) 2015-2023 Free Software Foundation, Inc.
35791+
Copyright (C) 2015-2024 Free Software Foundation, Inc.
3579235792

3579335793
This file is part of GNU Emacs.
3579435794

‎ChangeLog.3

+1-1
Original file line numberDiff line numberDiff line change
@@ -237355,7 +237355,7 @@ See ChangeLog.2 for earlier changes.
237355237355
;; coding: utf-8
237356237356
;; End:
237357237357

237358-
Copyright (C) 2015-2023 Free Software Foundation, Inc.
237358+
Copyright (C) 2015-2024 Free Software Foundation, Inc.
237359237359

237360237360
This file is part of GNU Emacs.
237361237361

‎ChangeLog.4

+1-1
Original file line numberDiff line numberDiff line change
@@ -119368,7 +119368,7 @@ See ChangeLog.3 for earlier changes.
119368119368
;; coding: utf-8
119369119369
;; End:
119370119370

119371-
Copyright (C) 2022 Free Software Foundation, Inc.
119371+
Copyright (C) 2022, 2024 Free Software Foundation, Inc.
119372119372

119373119373
This file is part of GNU Emacs.
119374119374

‎GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build Emacs from a fresh tarball or version-control checkout.
22

3-
# Copyright (C) 2011-2023 Free Software Foundation, Inc.
3+
# Copyright (C) 2011-2024 Free Software Foundation, Inc.
44
#
55
# This file is part of GNU Emacs.
66
#

‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GNU Emacs Installation Guide
2-
Copyright (C) 1992, 1994, 1996-1997, 2000-2023 Free Software Foundation,
2+
Copyright (C) 1992, 1994, 1996-1997, 2000-2024 Free Software Foundation,
33
Inc.
44
See the end of the file for license conditions.
55

‎INSTALL.REPO

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ never platform-specific.
9898

9999

100100

101-
Copyright (C) 2002-2023 Free Software Foundation, Inc.
101+
Copyright (C) 2002-2024 Free Software Foundation, Inc.
102102

103103
This file is part of GNU Emacs.
104104

‎Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### @configure_input@
22

3-
# Copyright (C) 1992-2023 Free Software Foundation, Inc.
3+
# Copyright (C) 1992-2024 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

‎README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2001-2023 Free Software Foundation, Inc.
1+
Copyright (C) 2001-2024 Free Software Foundation, Inc.
22
See the end of the file for license conditions.
33

44

‎admin/ChangeLog.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,7 @@
25772577
;; coding: utf-8
25782578
;; End:
25792579

2580-
Copyright (C) 2001-2023 Free Software Foundation, Inc.
2580+
Copyright (C) 2001-2024 Free Software Foundation, Inc.
25812581

25822582
This file is part of GNU Emacs.
25832583

‎admin/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2001-2023 Free Software Foundation, Inc.
1+
Copyright (C) 2001-2024 Free Software Foundation, Inc.
22
See the end of the file for license conditions.
33

44

‎admin/admin.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; admin.el --- utilities for Emacs administration -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2001-2024 Free Software Foundation, Inc.
44

55
;; This file is part of GNU Emacs.
66

‎admin/alloc-colors.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Allocate X colors. Used for testing with dense colormaps.
22

3-
Copyright (C) 2001-2023 Free Software Foundation, Inc.
3+
Copyright (C) 2001-2024 Free Software Foundation, Inc.
44

55
This file is part of GNU Emacs.
66

‎admin/authors.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2000-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2000-2024 Free Software Foundation, Inc.
44

55
;; Author: Gerd Moellmann <[email protected]>
66
;; Maintainer: [email protected]

‎admin/automerge

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
### automerge - automatically merge the Emacs release branch to master
33

4-
## Copyright (C) 2018-2023 Free Software Foundation, Inc.
4+
## Copyright (C) 2018-2024 Free Software Foundation, Inc.
55

66
## Author: Glenn Morris <[email protected]>
77
## Maintainer: Stefan Kangas <[email protected]>

‎admin/build-configs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/perl
22
# Build Emacs in several different configurations.
33

4-
# Copyright (C) 2001-2023 Free Software Foundation, Inc.
4+
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
55

66
# This file is part of GNU Emacs.
77

‎admin/charsets/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### @configure_input@
22

3-
# Copyright (C) 2015-2023 Free Software Foundation, Inc.
3+
# Copyright (C) 2015-2024 Free Software Foundation, Inc.
44

55
# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
66
# National Institute of Advanced Industrial Science and Technology (AIST)

‎admin/charsets/mapconv

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (C) 2015-2023 Free Software Foundation, Inc.
3+
# Copyright (C) 2015-2024 Free Software Foundation, Inc.
44

55
# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
66
# National Institute of Advanced Industrial Science and Technology (AIST)

‎admin/charsets/mapfiles/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2009-2023 Free Software Foundation, Inc.
1+
Copyright (C) 2009-2024 Free Software Foundation, Inc.
22
Copyright (C) 2009, 2010, 2011
33
National Institute of Advanced Industrial Science and Technology (AIST)
44
Registration Number H13PRO009

‎admin/check-man-pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
### check-man-pages - check man pages for errors
33

4-
## Copyright (C) 2022-2023 Free Software Foundation, Inc.
4+
## Copyright (C) 2022-2024 Free Software Foundation, Inc.
55

66
## Author: Stefan Kangas <[email protected]>
77

‎admin/cus-test.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; cus-test.el --- tests for custom types and load problems -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 1998, 2000, 2002-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 1998, 2000, 2002-2024 Free Software Foundation, Inc.
44

55
;; Author: Markus Rost <[email protected]>
66
;; Created: 13 Sep 1998

‎admin/diff-tar-files

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright (C) 2001-2023 Free Software Foundation, Inc.
3+
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

‎admin/emacs-shell-lib

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
### emacs-shell-lib - shared code for Emacs shell scripts
33

4-
## Copyright (C) 2022-2023 Free Software Foundation, Inc.
4+
## Copyright (C) 2022-2024 Free Software Foundation, Inc.
55

66
## Author: Stefan Kangas <[email protected]>
77

‎admin/emake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright (C) 2022-2023 Free Software Foundation, Inc.
3+
# Copyright (C) 2022-2024 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

‎admin/find-gc.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; find-gc.el --- detect functions that call the garbage collector -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 1992, 2001-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 1992, 2001-2024 Free Software Foundation, Inc.
44

55
;; Maintainer: [email protected]
66

‎admin/git-bisect-start

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
### default options, on a GNU/Linux computer and with GCC; see below),
77
### are skipped.
88

9-
## Copyright (C) 2022-2023 Free Software Foundation, Inc.
9+
## Copyright (C) 2022-2024 Free Software Foundation, Inc.
1010

1111
## This file is part of GNU Emacs.
1212

‎admin/gitmerge.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; gitmerge.el --- help merge one Emacs branch into another -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2010-2024 Free Software Foundation, Inc.
44

55
;; Authors: David Engster <[email protected]>
66
;; Stefan Monnier <[email protected]>

‎admin/grammars/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### @configure_input@
22

3-
## Copyright (C) 2013-2023 Free Software Foundation, Inc.
3+
## Copyright (C) 2013-2024 Free Software Foundation, Inc.
44

55
## This file is part of GNU Emacs.
66

‎admin/grammars/c.by

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; c.by -- LL grammar for C/C++ language specification
2-
;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
2+
;; Copyright (C) 1999-2024 Free Software Foundation, Inc.
33
;;
44
;; Author: Eric M. Ludlam <[email protected]>
55
;; David Ponce <[email protected]>

‎admin/grammars/grammar.wy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
22
;;
3-
;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2002-2024 Free Software Foundation, Inc.
44
;;
55
;; Author: David Ponce <[email protected]>
66
;; Created: 26 Aug 2002

‎admin/grammars/java-tags.wy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; java-tags.wy -- Semantic LALR grammar for Java
22

3-
;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2002-2024 Free Software Foundation, Inc.
44
;;
55
;; Author: David Ponce <[email protected]>
66
;; Created: 26 Aug 2002

‎admin/grammars/js.wy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; javascript-jv.wy -- LALR grammar for Javascript
22

3-
;; Copyright (C) 2005-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2005-2024 Free Software Foundation, Inc.
44
;; Copyright (C) 1998-2011 Ecma International.
55

66
;; Author: Joakim Verona

‎admin/grammars/make.by

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; make.by -- BY notation for Makefiles.
22

3-
;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 1999-2024 Free Software Foundation, Inc.
44
;;
55
;; Author: Eric M. Ludlam <[email protected]>
66
;; David Ponce <[email protected]>

‎admin/grammars/python.wy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; python.wy -- LALR grammar for Python
22

3-
;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2002-2024 Free Software Foundation, Inc.
44
;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
55
;; 2009, 2010 Python Software Foundation; All Rights Reserved
66

‎admin/grammars/scheme.by

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; scheme.by -- Scheme BNF language specification
22

3-
;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2001-2024 Free Software Foundation, Inc.
44

55
;; This file is part of GNU Emacs.
66

‎admin/grammars/srecode-template.wy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; srecode-template.wy --- Semantic Recoder Template parser
22

3-
;; Copyright (C) 2005-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2005-2024 Free Software Foundation, Inc.
44

55
;; Author: Eric M. Ludlam <[email protected]>
66
;; Keywords: syntax

‎admin/last-chance.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; last-chance.el --- dangling deterrence -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2016-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 2016-2024 Free Software Foundation, Inc.
44

55
;; Author: Thien-Thi Nguyen <[email protected]>
66
;; Maintainer: [email protected]

‎admin/make-emacs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Build Emacs with various options for profiling, debugging,
33
# with and without warnings enabled etc.
44

5-
# Copyright (C) 2001-2023 Free Software Foundation, Inc.
5+
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
66

77
# This file is part of GNU Emacs.
88

‎admin/make-manuals

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
### make-manuals - create the Emacs manuals to upload to the gnu.org website
33

4-
## Copyright 2018-2023 Free Software Foundation, Inc.
4+
## Copyright 2018-2024 Free Software Foundation, Inc.
55

66
## Author: Glenn Morris <[email protected]>
77
## Maintainer: [email protected]

‎admin/merge-gnulib

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# admin/merge-gnulib
66

7-
# Copyright 2012-2023 Free Software Foundation, Inc.
7+
# Copyright 2012-2024 Free Software Foundation, Inc.
88

99
# This file is part of GNU Emacs.
1010

‎admin/merge-pkg-config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# admin/merge-pkg-config
66

7-
# Copyright 2014-2023 Free Software Foundation, Inc.
7+
# Copyright 2014-2024 Free Software Foundation, Inc.
88

99
# This file is part of GNU Emacs.
1010

‎admin/notes/copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2007-2023 Free Software Foundation, Inc.
1+
Copyright (C) 2007-2024 Free Software Foundation, Inc.
22
See the end of the file for license conditions.
33

44

‎admin/notes/emba

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-*- mode: outline; coding: utf-8 -*-
22

3-
Copyright (C) 2019-2023 Free Software Foundation, Inc.
3+
Copyright (C) 2019-2024 Free Software Foundation, Inc.
44
See the end of the file for license conditions.
55

66
NOTES FOR EMACS CONTINUOUS BUILD ON EMBA

‎admin/notes/hydra

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-*- mode: outline; coding: utf-8 -*-
22

3-
Copyright (C) 2013-2023 Free Software Foundation, Inc.
3+
Copyright (C) 2013-2024 Free Software Foundation, Inc.
44
See the end of the file for license conditions.
55

66
NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA

‎admin/notes/multi-tty

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-*- coding: utf-8; mode: text; -*-
22

3-
Copyright (C) 2007-2023 Free Software Foundation, Inc.
3+
Copyright (C) 2007-2024 Free Software Foundation, Inc.
44
See the end of the file for license conditions.
55

66
From README.multi-tty in the multi-tty branch.

0 commit comments

Comments
 (0)