Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update emacs to 1:29.4+1-4 #4

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Attributes of Emacs files in the Git repository.

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

# This file is part of GNU Emacs.

Expand Down
28 changes: 27 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Files that Git should ignore in the Emacs source directory.

# Copyright 2009-2022 Free Software Foundation, Inc.
# Copyright 2009-2024 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand All @@ -25,6 +25,7 @@

# Personal customization.
.dir-locals-2.el
.no-advice-on-failure

# Built by 'autogen.sh'.
/aclocal.m4
Expand Down Expand Up @@ -53,6 +54,7 @@ src/emacs-module.h

# C-level sources built by 'make'.
lib/alloca.h
lib/assert.h
lib/byteswap.h
lib/dirent.h
lib/errno.h
Expand Down Expand Up @@ -93,6 +95,7 @@ lisp/cedet/semantic/grammar-wy.el
lisp/eshell/esh-groups.el
lisp/finder-inf.el
lisp/leim/ja-dic/
leim/small-ja-dic-option
lisp/leim/leim-list.el
lisp/leim/quail/4Corner.el
lisp/leim/quail/ARRAY30.el
Expand Down Expand Up @@ -156,9 +159,11 @@ test/manual/etags/srclist
test/manual/etags/regexfile
test/manual/etags/ETAGS
test/manual/etags/CTAGS
test/manual/etags/CTAGS*.sorted
test/manual/indent/*.new
test/lisp/gnus/mml-sec-resources/random_seed
test/lisp/play/fortune-resources/fortunes.dat
test/**/*.xml

# ctags, etags.
TAGS
Expand All @@ -182,6 +187,7 @@ ID
# Executables.
*.exe
a.out
lib-src/be-resources
lib-src/blessmail
lib-src/ctags
lib-src/ebrowse
Expand All @@ -203,6 +209,7 @@ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
src/bootstrap-emacs
src/emacs
src/emacs-[0-9]*
src/Emacs
src/temacs
src/dmpstruct.h
src/*.pdmp
Expand All @@ -215,8 +222,10 @@ lisp/international/charprop.el
lisp/international/charscript.el
lisp/international/cp51932.el
lisp/international/emoji-zwj.el
lisp/international/emoji-labels.el
lisp/international/eucjp-ms.el
lisp/international/uni-*.el
lisp/international/idna-mapping.el
lisp/language/pinyin.el

# Documentation.
Expand Down Expand Up @@ -313,3 +322,20 @@ lib-src/seccomp-filter.bpf
lib-src/seccomp-filter.pfc
lib-src/seccomp-filter-exec.bpf
lib-src/seccomp-filter-exec.pfc

# gsettings schema
/etc/*.gschema.valid

# Ignore directory made by admin/make-manuals.
/manual/

# Ignore Finder files on MacOS.
.DS_Store

# Ignore a directory used by dap-mode.
.vscode
/test/gmp.h

# GDB history
.gdb_history
_gdb_history
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2021-2023 Free Software Foundation, Inc.
# Copyright (C) 2021-2024 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
Expand Down
5 changes: 2 additions & 3 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Maxim Nikulin <manikulin@gmail.com>
Michael Albinus <michael.albinus@gmx.de> <albinus@detlef>
Michalis V <mvar.40k@gmail.com>
Miha Rihtaršič <miha@kamnitnik.top>
Morgan J. Smith <Morgan.J.Smith@outlook.com>
Morgan Smith <Morgan.J.Smith@outlook.com>
Nick Drozd <nicholasdrozd@gmail.com>
Nicolas Petton <nicolas@petton.fr> <petton.nicolas@gmail.com>
Nitish Chandra <nitishchandrachinta@gmail.com>
Expand All @@ -143,8 +143,7 @@ Philip Kaludercic <philipk@posteo.net>
Philip Kaludercic <philipk@posteo.net> <philip.kaludercic@fau.de>
Philip Kaludercic <philipk@posteo.net> <philip@icterid>
Philip Kaludercic <philipk@posteo.net> <philip@warpmail.net>
Philipp Stephani <phst@google.com>
Philipp Stephani <phst@google.com> Philipp Stephani <p.stephani2@gmail.com>
Philipp Stephani <p.stephani2@gmail.com>
Phillip Lord <phillip.lord@russet.org.uk> <phillip.lord@newcastle.ac.uk>
Pierre Lorenzon <devel@pollock-nageoire.net>
Pieter van Oostrum <pieter@vanoostrum.org> <pieter-l@vanoostrum.org>
Expand Down
4 changes: 4 additions & 0 deletions BUGS
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ If necessary, you can read the manual without an info program:

cat info/emacs* | more "+/^File: emacs.*, Node: Bugs,"

If you think you may have found a critical security issue that needs
to be communicated privately, please contact the GNU Emacs maintainers
directly. See admin/MAINTAINERS for their contact details.


Please first check the file etc/PROBLEMS (e.g. with C-h C-p in Emacs) to
make sure it isn't a known issue.
61 changes: 36 additions & 25 deletions CONTRIBUTE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2006-2023 Free Software Foundation, Inc.
Copyright (C) 2006-2024 Free Software Foundation, Inc.
See the end of the file for license conditions.

* How developers contribute to GNU Emacs
Expand Down Expand Up @@ -115,14 +115,15 @@ mode after hiding the body of each entry.

Doc-strings should be updated together with the code.

New defcustom's should always have a ':version' tag stating the first
Emacs version in which they will appear. Likewise with defcustom's
whose value is changed -- update their ':version' tag.
New defcustom's and defface's should always have a ':version' tag
stating the first Emacs version in which they will appear. Likewise
with defcustom's or defface's whose value is changed -- update their
':version' tag.

Think about whether your change requires updating the manuals. If you
know it does not, mark the NEWS entry with "---". If you know
that *all* the necessary documentation updates have been made as part
of your changes or those by others, mark the entry with "+++".
know it does not, mark the NEWS entry with "---" before the entry. If
you know that *all* the necessary documentation updates have been made
as part of your changes or those by others, mark the entry with "+++".
Otherwise, do not mark it.

If your change requires updating the manuals to document new
Expand Down Expand Up @@ -170,9 +171,9 @@ test 'out-of-tree' builds as well, i.e.:

** Commit messages

Ordinarily, a change you commit should contain a log entry in its
commit message and should not touch the repository's ChangeLog files.
Here is an example commit message (indented):
Ordinarily, a changeset you commit should contain a description of the
changes in its commit message and should not touch the repository's
ChangeLog files. Here is an example commit message (indented):

Deactivate shifted region

Expand All @@ -184,8 +185,9 @@ Here is an example commit message (indented):
Deactivate the mark.

Occasionally, commit messages are collected and prepended to a
ChangeLog file, where they can be corrected. It saves time to get
them right the first time, so here are guidelines for formatting them:
generated ChangeLog file, where they can be corrected. It saves time
to get them right the first time, so here are guidelines for
formatting them:

- Start with a single unindented summary line explaining the change;
do not end this line with a period. If possible, try to keep the
Expand All @@ -194,9 +196,10 @@ them right the first time, so here are guidelines for formatting them:
contexts.

If the summary line starts with a semicolon and a space "; ", the
commit message will be ignored when generating the ChangeLog file.
Use this for minor commits that do not need separate ChangeLog
entries, such as changes in etc/NEWS.
commit message will be skipped and not added to the generated
ChangeLog file. Use this for minor commits that do not need to be
mentioned in the ChangeLog file, such as changes in etc/NEWS, typo
fixes, etc.

- After the summary line, there should be an empty line.

Expand All @@ -211,8 +214,9 @@ them right the first time, so here are guidelines for formatting them:
enforced by a commit hook.

- If only a single file is changed, the summary line can be the normal
file first line (starting with the asterisk). Then there is no
individual files section.
first line of a ChangeLog entry (starting with the asterisk). Then
there will be no individual ChangeLog entries beyond the one in the
summary line.

- If the commit has more than one author, the commit message should
contain separate lines to mention the other authors, like the
Expand All @@ -233,6 +237,8 @@ them right the first time, so here are guidelines for formatting them:
particular, gnu.org and fsf.org URLs should start with "https:".

- Commit messages should contain only printable UTF-8 characters.
However, we ask that non-ASCII characters be used only if strictly
necessary, not just for aesthetic purposes.

- Commit messages should not contain the "Signed-off-by:" lines that
are used in some other projects.
Expand All @@ -243,12 +249,12 @@ them right the first time, so here are guidelines for formatting them:
- Explaining the rationale for a design choice is best done in comments
in the source code. However, sometimes it is useful to describe just
the rationale for a change; that can be done in the commit message
between the summary line and the file entries.
between the summary line and the following ChangeLog entries.

- Emacs generally follows the GNU coding standards for ChangeLogs: see
https://www.gnu.org/prep/standards/html_node/Change-Logs.html
or run 'info "(standards)Change Logs"'. One exception is that
commits still sometimes quote `like-this' (as the standards used to
- Emacs follows the GNU coding standards for ChangeLog entries: see
https://www.gnu.org/prep/standards/html_node/Change-Logs.html or run
'info "(standards)Change Logs"'. One exception is that commits
still sometimes quote `like-this' (as the standards used to
recommend) rather than 'like-this' or ‘like this’ (as they do now),
as `...' is so widely used elsewhere in Emacs.

Expand All @@ -261,9 +267,9 @@ them right the first time, so here are guidelines for formatting them:
in Emacs; that includes spelling and leaving 2 blanks between
sentences.

They are preserved indefinitely, and have a reasonable chance of
being read in the future, so it's better that they have good
presentation.
The ChangeLog entries are preserved indefinitely, and have a
reasonable chance of being read in the future, so it's better that
they have good presentation.

- Use the present tense; describe "what the change does", not "what
the change did".
Expand Down Expand Up @@ -300,6 +306,11 @@ them right the first time, so here are guidelines for formatting them:
blank ChangeLog entries from the diff being committed, then use
'M-q' to combine and fill them. See 'info "(emacs) Log Buffer"'.

- If you use the third-party package Magit, you can use
'magit-generate-changelog' from the commit message buffer.
See also 'magit-add-change-log-entry' and
'magit-add-change-log-entry-other-window'.

- Alternatively, you can use Emacs functions for ChangeLog files; see
https://www.gnu.org/software/emacs/manual/html_node/emacs/Change-Log-Commands.html
or run 'info "(emacs)Change Log Commands"'.
Expand Down
2 changes: 1 addition & 1 deletion ChangeLog.1
Original file line number Diff line number Diff line change
Expand Up @@ -14700,7 +14700,7 @@
;; coding: utf-8
;; End:

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

This file is part of GNU Emacs.

Expand Down
27 changes: 14 additions & 13 deletions ChangeLog.2
Original file line number Diff line number Diff line change
Expand Up @@ -8956,10 +8956,10 @@

2016-02-04 Carlos Pita <carlosjosepita@gmail.com> (tiny change)

Make complection in erc use consistent casing
Make completion in erc use consistent casing

* lisp/erc/erc-pcomplete.el (pcomplete-erc-all-nicks): Make
case in the complection consistent (bug#18509).
case in the completion consistent (bug#18509).

2016-02-04 Francis Litterio <flitterio@gmail.com>

Expand Down Expand Up @@ -10661,8 +10661,8 @@

* lisp/gnus/nnir.el (nnir-request-update-mark):
Default to the original mark.
cf. <http://thread.gmane.org/gmane.emacs.gnus.general/86583>
and <http://thread.gmane.org/gmane.emacs.gnus.general/86640>
cf. <http://thread.gmane.org/gmane.emacs.gnus.general/86583> [dead link]
and <http://thread.gmane.org/gmane.emacs.gnus.general/86640> [dead link]

2016-01-19 Glenn Morris <rgm@gnu.org>

Expand Down Expand Up @@ -12012,7 +12012,7 @@
(Maybe this is the last merge from Gnus git to Emacs git)

Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>. [dead link]
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
Expand Down Expand Up @@ -15206,8 +15206,9 @@
Remove nnml-retrieve-groups that is unnecessary and somewhat problematic

* lisp/gnus/nnml.el (nnml-retrieve-groups): Remove. See:
<http://thread.gmane.org/gmane.emacs.gnus.general/86308> and
<http://thread.gmane.org/gmane.emacs.gnus.general/86321>
<http://thread.gmane.org/gmane.emacs.gnus.general/86308> [dead link]
and
<http://thread.gmane.org/gmane.emacs.gnus.general/86321> [dead link]

2015-11-25 Paul Eggert <eggert@cs.ucla.edu>

Expand Down Expand Up @@ -17093,11 +17094,11 @@
* lisp/json.el (json-encoding-object-sort-predicate): New variable
for specifying a sorting predicate for JSON objects during encoding.
(json--plist-to-alist): New utility function.
(json-encode-hash-table): Re-use `json-encode-alist' when object keys
(json-encode-hash-table): Reuse `json-encode-alist' when object keys
are to be sorted.
(json-encode-alist): Sort output by
`json-encoding-object-sort-predicate, when set.
(json-encode-plist): Re-use `json-encode-alist' when object keys are
(json-encode-plist): Reuse `json-encode-alist' when object keys are
to be sorted.
(json-pretty-print-buffer-ordered): New command to pretty print the
buffer with object keys sorted alphabetically.
Expand Down Expand Up @@ -19541,7 +19542,7 @@
calling low-level functions.

* test/automated/file-notify-tests.el (file-notify--test-timeout):
Decrase to 6 seconds for remote directories.
Decrease to 6 seconds for remote directories.
(file-notify-test02-events): Expect different number of
`attribute-changed' events for the local and remote cases. Apply
short delays between the operations, in order to receive all
Expand Down Expand Up @@ -30968,7 +30969,7 @@
2015-05-28 Katsumi Yamaoka <yamaoka@jpl.org>

* lisp/gnus/gnus-art.el (gnus-button-alist): Re-revert last change.
cf. <http://news.gmane.org/group/gmane.emacs.devel/thread=186896>
cf. <http://news.gmane.org/group/gmane.emacs.devel/thread=186896> [dead link]

2015-05-28 Samer Masterson <samer@samertm.com>

Expand Down Expand Up @@ -32623,7 +32624,7 @@
(verilog-set-auto-endcomments): Fix end comments for functions of
type void, etc. Reported by Alex Reed.
(verilog-do-indent): Fix electric tab deleting form-feeds. Note
caused by indent-line-to deleting tabls pre 24.5.
caused by indent-line-to deleting tables pre 24.5.
(verilog-nameable-item-re): Fix nameable items that can have an
end-identifier to include endchecker, endgroup, endprogram,
endproperty, and endsequence. Reported by Alex Reed.
Expand Down Expand Up @@ -35787,7 +35788,7 @@ See ChangeLog.1 for earlier changes.
;; coding: utf-8
;; End:

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

This file is part of GNU Emacs.

Expand Down
Loading
Loading