Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 04:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from origin/emacs-31

Browse source 
8d0bf280a6 ; * ChangeLog.5: Some fixes and tidying up.
1ec79b48f3 ; Update exported ChangeLog files and etc/AUTHORS
991f6100eb ; * admin/make-tarball.txt: Suggest load-file, not require.
3c6c3f5a69 ; Fix two file headers misunderstood by authors.el.
This commit is contained in:
Sean Whitton 2026-05-07 20:15:39 +01:00
commit 90f8f27a58
8 changed files with 63894 additions and 595 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.3
View file

@ -3149,7 +3149,7 @@
Remove mention of removed `gnus-treat-play-sounds' variable from manual
* info/gnus.info: Remove `gnus-treat-play-sounds' from
* doc/misc/gnus.texi: Remove `gnus-treat-play-sounds' from
manual. According to lisp/gnus/ChangeLog.3 this variable was
removed in 2010 (bug#53192).
@ -46460,7 +46460,7 @@
* lisp/subr.el (ctl-x-map): Initialize inside the declaration.
* src/command.h (control_x_map):
* src/commands.h (control_x_map):
* src/keymap.c (control_x_map): Delete variable.
(syms_of_keymap):
* src/keyboard.c (keys_of_keyboard):

62982
ChangeLog.5
View file

File diff suppressed because it is too large Load diff

2
Makefile.in
View file

@ -1313,7 +1313,7 @@ ChangeLog:
./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
# Check that we are in a good state for changing history.
PREFERRED_BRANCH = emacs-30
PREFERRED_BRANCH = emacs-31
preferred-branch-is-current:
git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
unchanged-history-files:

60
admin/authors.el
View file

@ -49,9 +49,11 @@ files.")
("Alexander Gramiak" "Alex Gramiak")
("Alexandru Harsanyi" "Alex Harsanyi")
("Álvar Jesús Ibeas Martín" "Álvar Ibeas")
("Álvaro Ramírez" "Alvaro Ramirez" "xenodium")
(nil "ambihelical")
("Andrea Corallo" "AndreaCorallo")
("Andrii Kolomoiets" "andreyk\\.mad@gmail\\.com")
("André A. Gomes" "Andre A. Gomes")
("Andrew Csillag" "Drew Csillag")
("Andrew G Cohen" "Andrew Cohen")
("Anna M. Bigatti" "Anna Bigatti")
@ -226,6 +228,7 @@ files.")
(nil "pillule")
(nil "psyberbits@gmail\\.com")
("Paul Eggert" "Paul R\\. Eggert")
("Paul Nelson" "Paul D. Nelson")
("Pavel Janík" "Pavel Janík Ml\\." "Pavel Janik Ml\\." "Pavel Janik")
("Pavel Kobiakov" "Pavel Kobyakov")
("Per Abrahamsen" "Per Abhiddenware")
@ -700,7 +703,11 @@ Changes to files matching one of the regexps in this list are not listed.")
"lisp/org/ob-picolisp.el"
"lisp/obsolete/levents.el"
"lisp/obsolete/lucid.el"
"lisp/obsolete/old-whitespace.el")
"lisp/obsolete/old-whitespace.el"
"doc/misc/modus-themes.texi"
"doc/misc/elisp-semantic-highlighting.org"
"lisp/emacs-lisp/scope.el"
"etc/yow.lines")
"List of files and directories to ignore.
Changes to files in this list are not listed.")
@ -1164,7 +1171,42 @@ AUTHORS file. There are also some more recent manual additions.")
"admin/notes/tree-sitter/build-module/batch.sh"
"doc/misc/gnus-coding.texi"
"gnus-coding.texi"
"doc/misc/org.texi")
"doc/misc/org.texi"
;; Unexec & pure space removal.
"src/puresize.h"
"src/sheap.c"
"src/sheap.h"
"src/unexec.h"
"src/unexaix.c"
"src/unexcoff.c"
"src/unexcw.c"
"src/unexelf.c"
"src/unexhp9k800.c"
"src/unexmacosx.c"
"src/unexsol.c"
"src/unexw32.c"
"src/firstfile.c"
"src/lastfile.c"
;; Removed.
"nt/configure.bat"
"lisp/obsolete/cc-compat.el"
"lisp/obsolete/info-edit.el"
"lisp/obsolete/otodo-mode.el"
"lisp/obsolete/rcompile.el"
"lisp/terminal.el"
"lisp/obsolete/vi.el"
"lisp/obsolete/vip.el"
"doc/misc/vip.texi"
"lisp/obsolete/ws-mode.el"
"lisp/obsolete/yow.el"
"test/lisp/erc/resources/base/reconnect/ping-pong.eld"
"test/lisp/erc/resources/base/reconnect/proxy-solo.eld"
"test/lisp/erc/resources/erc-d/resources/proxy-solo.eld"
"admin/coccinelle/process.cocci"
"admin/coccinelle/window.cocci"
"admin/coccinelle/frame.cocci"
;; Merged into various files in cl-lib.
"lisp/emacs-lisp/cl-types.el" "test/lisp/emacs-lisp/cl-types-tests.el")
"File names which are valid, but no longer exist (or cannot be found)
in the repository.")
@ -1416,7 +1458,7 @@ in the repository.")
("lisp/new/eww.el" . "eww.el") ; an actual typo in ChangeLog.3
("gssapi.el" . "gssapi.el")
("lisp/gnus/gssapi.el" . "gssapi.el")
("imap.el" . "net/imap.el")
("imap.el" . "imap.el")
("mailcap.el" . "mailcap.el")
("gnus/mailcap.el" . "mailcap.el")
("lisp/gnus/mailcap.el" . "mailcap.el")
@ -1726,7 +1768,17 @@ in the repository.")
("lisp/vt100-led.el" . "lisp/obsolete/vt100-led.el")
("lisp/mail/metamail.el" . "lisp/obsolete/metamail.el")
("lisp/sb-image.el" . "lisp/obsolete/sb-image.el")
("lisp/cedet/semantic/grammar-wy.el" . "lisp/cedet/semantic/grm-wy-boot.el"))
("lisp/cedet/semantic/grammar-wy.el" . "lisp/cedet/semantic/grm-wy-boot.el")
("lisp/vc/vc-dav.el" . "vc-dav.el")
("test/lisp/vc/vc-tests.el" . "vc-tests.el")
("admin/notes/elpa" . "elpa.md")
("etc/NEWS.unknown" . "symbol-releases.eld")
("test/lisp/eshell/eshell-tests-helpers.el" . "eshell-tests-helpers.el")
("test/lisp/package-vc-tests.el" . "package-vc-tests.el")
("test/lisp/vc/vc-misc-tests.el" . "vc-test-misc.el")
("admin/treesit-admin.el" . "treesit-admin.el")
("java/incrementing-version-code" . "AndroidManifest.xml.in")
("etc/ctags.1" "ctags.1"))
"Alist of files which have been renamed during their lifetime.
Elements are (OLDNAME . NEWNAME).")

2
admin/make-tarball.txt
View file

@ -108,7 +108,7 @@ General steps (for each step, check for possible errors):
Now:
M-: (require 'authors) RET
M-x load-file RET admin/authors.el RET
M-x authors RET
If this says "Problem updating ChangeLog", find the reason for the

1426
etc/AUTHORS
View file

File diff suppressed because it is too large Load diff

3
lisp/org/ob-ditaa.el
View file

@ -2,7 +2,8 @@
;; Copyright (C) 2009-2026 Free Software Foundation, Inc.
;; Authors: Eric Schulte, Jarmo Hurri
;; Authors: Eric Schulte
;; Jarmo Hurri
;; Keywords: literate programming, reproducible research
;; URL: https://orgmode.org

10
lisp/progmodes/lua-mode.el
View file

@ -7,11 +7,11 @@
;; 2006 Juergen Hoetzel <juergen@hoetzel.info>
;; 2004 various (support for Lua 5 and byte compilation)
;; 2001 Christian Vogler <cvogler@gradient.cis.upenn.edu>
;; 1997 Bret Mogilefsky <mogul-lua@gelatinous.com> starting from
;; tcl-mode by Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>
;; with tons of assistance from
;; Paul Du Bois <pld-lua@gelatinous.com> and
;; Aaron Smith <aaron-lua@gelatinous.com>.
;; 1997 Bret Mogilefsky <mogul-lua@gelatinous.com>
;; Bret Mogilefsky started from tcl-mode by
;; Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>
;; with tons of assistance from Paul Du Bois <pld-lua@gelatinous.com>
;; and Aaron Smith <aaron-lua@gelatinous.com>.
;; Maintainer: emacs-devel@gnu.org
;; Keywords: languages, processes, tools