Merge branch 'emacs-29' of git://git.sv.gnu.org/emacs into pgtk-nativecomp

.clang-format

@@ -1,12 +1,20 @@
 Language: Cpp
 BasedOnStyle: GNU
 AlignEscapedNewlinesLeft: true
+AlignOperands: Align
 AlwaysBreakAfterReturnType: TopLevelDefinitions
 BreakBeforeBinaryOperators: All
 BreakBeforeBraces: GNU
 ColumnLimit: 70
 ContinuationIndentWidth: 2
-ForEachMacros: [FOR_EACH_TAIL, FOR_EACH_TAIL_SAFE]
+IndentPPDirectives: AfterHash
+PPIndentWidth: 1
+ForEachMacros:
+  - FOR_EACH_TAIL
+  - FOR_EACH_TAIL_SAFE
+  - FOR_EACH_LIVE_BUFFER
+  - ITREE_FOREACH
+  - FOR_EACH_ALIST_VALUE
 IncludeCategories:
   - Regex: '^<config\.h>$'
     Priority: -1
@@ -16,11 +24,17 @@ IncludeCategories:
     Priority: 2
   - Regex: '.*'
     Priority: 3
+WhitespaceSensitiveMacros:
+  - STR
+  - CALL1I
+  - CALL2I
+  - STR_VALUE
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakBeforeFirstCallParameter: 2000
 SpaceAfterCStyleCast: true
 SpaceBeforeParens: Always
+UseTab: Always
 
 # Local Variables:
 # mode: yaml

.dir-locals.el

@@ -1,12 +1,18 @@
-;;; Directory Local Variables
+;;; Directory Local Variables         -*- no-byte-compile: t; -*-
 ;;; For more information see (info "(emacs) Directory Variables")
 
 ((nil . ((tab-width . 8)
          (sentence-end-double-space . t)
          (fill-column . 70)
-         (bug-reference-url-format . "https://debbugs.gnu.org/%s")))
+	 (emacs-lisp-docstring-fill-column . 65)
+         (vc-git-annotate-switches . "-w")
+         (bug-reference-url-format . "https://debbugs.gnu.org/%s")
+	 (diff-add-log-use-relative-names . t)
+         (vc-prepare-patches-separately . nil)))
  (c-mode . ((c-file-style . "GNU")
-            (c-noise-macro-names . ("INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED" "UNINIT" "CALLBACK" "ALIGN_STACK"))
+            (c-noise-macro-names . ("INLINE" "NO_INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED"
+                                    "UNINIT" "CALLBACK" "ALIGN_STACK" "ATTRIBUTE_MALLOC"
+                                    "ATTRIBUTE_DEALLOC_FREE"))
             (electric-quote-comment . nil)
             (electric-quote-string . nil)
             (indent-tabs-mode . t)
@@ -15,8 +21,12 @@
                (electric-quote-comment . nil)
                (electric-quote-string . nil)
 	       (mode . bug-reference-prog)))
+ (c-ts-mode . ((c-ts-mode-indent-style . gnu)
+               (indent-tabs-mode . t)
+               (mode . bug-reference-prog)))
  (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
-                   (log-edit-setup-add-author . t)))
+                   (log-edit-setup-add-author . t)
+		   (vc-git-log-edit-summary-target-len . 50)))
  (change-log-mode . ((add-log-time-zone-rule . t)
 		     (fill-column . 74)
 		     (mode . bug-reference)))
@@ -25,6 +35,7 @@
                      (electric-quote-comment . nil)
                      (electric-quote-string . nil)
 	             (mode . bug-reference-prog)))
+ (lisp-data-mode . ((indent-tabs-mode . nil)))
  (texinfo-mode . ((electric-quote-comment . nil)
                   (electric-quote-string . nil)
 	          (mode . bug-reference-prog)))

.gitattributes

@@ -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.
 

.gitignore

@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2023 Free Software Foundation, Inc.
+# Copyright 2009-2024 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -25,6 +25,7 @@
 
 # Personal customization.
 .dir-locals-2.el
+.no-advice-on-failure
 
 # Built by 'autogen.sh'.
 /aclocal.m4
@@ -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
@@ -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
@@ -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
@@ -182,6 +187,7 @@ ID
 # Executables.
 *.exe
 a.out
+lib-src/be-resources
 lib-src/blessmail
 lib-src/ctags
 lib-src/ebrowse
@@ -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
@@ -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.
@@ -316,3 +325,17 @@ 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

.gitlab-ci.yml

@@ -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.
 #
@@ -15,7 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
-# GNU Emacs support for the GitLab protocol for CI
+# GNU Emacs support for the GitLab protocol for CI.
 
 # The presence of this file does not imply any FSF/GNU endorsement of
 # any particular service that uses that protocol.  Also, it is intended for

.mailmap

@@ -30,6 +30,8 @@ Artur Malabarba <[email protected]> <[email protected]>
 Bastien Guerry <[email protected]>
 Bastien Guerry <[email protected]> <[email protected]>
 Bastien Guerry <[email protected]> <[email protected]>
+Benjamin Schwerdtner <[email protected]>
+Bob Rogers <[email protected]> <[email protected]>
 Bruno Félix Rezende Ribeiro <[email protected]> <[email protected]>
 Carlos Pita <[email protected]>
 Chong Yidong <[email protected]> <[email protected]>
@@ -77,6 +79,9 @@ Ian Dunn <[email protected]>
 Jan Djärv <[email protected]>
 Jan Djärv <[email protected]> <[email protected]>
 Jason Rumney <[email protected]> <jasonr@wanchan>
+Jeff Walsh <[email protected]> <[email protected]>
+Jeff Walsh <[email protected]> <[email protected]>
+Jeff Walsh <[email protected]> <[email protected]>
 Jens Lechtenbörger <[email protected]>
 Jim Blandy <[email protected]> <[email protected]>
 Jimmy Aguilar Mena <[email protected]>
@@ -100,12 +105,14 @@ Kenichi Handa <[email protected]>
 Kenichi Handa <[email protected]> <handa@etlken>
 Kenichi Handa <[email protected]> <[email protected]>
 Kenjiro Nakayama <[email protected]>
+Kjartan Óli Ágústsson <[email protected]>
 Károly Lőrentey <[email protected]>
 Lars Ingebrigtsen <[email protected]>
 Lars Ingebrigtsen <[email protected]> <[email protected]>
 Lars Ingebrigtsen <[email protected]> <[email protected]>
 Lars Ingebrigtsen <[email protected]> <[email protected]>
 Lars Ingebrigtsen <[email protected]> <[email protected]>
+Laurence Warne <[email protected]>
 Lin Sun <[email protected]>
 Ludovic Courtès <[email protected]>
 Luke Lee <[email protected]>
@@ -119,6 +126,7 @@ Maxim Nikulin <[email protected]>
 Michael Albinus <[email protected]> <albinus@detlef>
 Michalis V <[email protected]>
 Miha Rihtaršič <[email protected]>
+Morgan J. Smith <[email protected]>
 Nick Drozd <[email protected]>
 Nicolas Petton <[email protected]> <[email protected]>
 Nitish Chandra <[email protected]>
@@ -133,13 +141,15 @@ Peter Oliver <[email protected]> <[email protected]>
 Peter Oliver <[email protected]> <[email protected]>
 Philip Kaludercic <[email protected]>
 Philip Kaludercic <[email protected]> <[email protected]>
+Philip Kaludercic <[email protected]> <philip@icterid>
 Philip Kaludercic <[email protected]> <[email protected]>
 Philipp Stephani <[email protected]>
 Philipp Stephani <[email protected]> Philipp Stephani <[email protected]>
 Phillip Lord <[email protected]> <[email protected]>
 Pierre Lorenzon <[email protected]>
 Pieter van Oostrum <[email protected]> <[email protected]>
 Pip Cet <[email protected]>
+Po Lu <[email protected]>
 Po Lu <[email protected]> Po Lu via <[email protected]>
 Przemysław Wojnowski <[email protected]>
 Rasmus <[email protected]>
@@ -149,8 +159,10 @@ Robert Weiner <[email protected]> <[email protected]>
 Roland Winkler <[email protected]> <[email protected]>
 Ronnie Schnell <[email protected]>
 Ryan C. Thompson <[email protected]>
-Simen Heggestøyl <[email protected]>
-Simen Heggestøyl <[email protected]> <[email protected]>
+Sam Steingold <[email protected]> <[email protected]>
+Simen Heggestøyl <[email protected]>
+Simen Heggestøyl <[email protected]> <[email protected]>
+Simen Heggestøyl <[email protected]> <[email protected]>
 Simon Josefsson <[email protected]> <[email protected]>
 Stefan Kangas <[email protected]> <[email protected]>
 Stefan Monnier <[email protected]> <[email protected]>
@@ -172,10 +184,13 @@ Ulf Jasper <[email protected]> Ulf Jasper <>
 Ulf Jasper <[email protected]> Ulf Jasper <ulf@uthinkpad>
 Ulrich Müller <[email protected]>
 Vinicius Jose Latorre <[email protected]> <[email protected]>
+Vladimir Nikishkin <[email protected]> <[email protected]>
 Werner Lemberg <[email protected]>
 Wolfgang Scherer <[email protected]> <[email protected]>
 Xi Lu <[email protected]>
 Xue Fuqiao <[email protected]> <[email protected]>
+Yilkal Argaw <[email protected]>
+Yuuki Harano <[email protected]> <[email protected]>
 Óscar Fuentes <[email protected]>
 İ. Göktuğ Kayaalp <[email protected]>
 Łukasz Stelmach <[email protected]> <[email protected]>