Merge version 1:29.4+1-3+rpi1 and 1:29.4+1-4 to produce 1:29.4+1-4+rpi1

diff --cc debian/changelog
index a8a57376d23d3b08691116816cc9e0c0235694fc,01d6e9bb432fec9459f5605731d39963c363a629..e311f93ce4cf811f6233656ba2a9a9cde7633c8d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,22 @@@
- emacs (1:29.4+1-3+rpi1) trixie-staging; urgency=medium
++emacs (1:29.4+1-4+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1:29.4+1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 23:24:37 +0000]
 +  * Switch to gcc 14.
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 28 Jul 2024 23:24:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Dec 2024 07:50:01 +0000
++
+ emacs (1:29.4+1-4) unstable; urgency=medium
+ 
+   * 00debian.el: Mark file with 'lexical-binding: t'.
+   * 00debian.el: Use setopt, not setq.
+   
+   * Suggest emacs-editing-major-modes.
+   
+   * Disable flymake included-c-header-files test to fix build with
+     gcc-14 (Closes: #1074936).
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 08 Dec 2024 13:38:47 +0800
  
  emacs (1:29.4+1-3) unstable; urgency=high
  

diff --cc debian/control
Simple merge