From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 13 Feb 2025 01:58:04 +0000 (+0800)
Subject: Fix eldoc warning in patch adding debian-emacs-flavor
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=14619c249978fc9a742d0216a5f60a12e2344df8;p=emacs.git

Fix eldoc warning in patch adding debian-emacs-flavor

Thanks to Xiyue Deng for the report and fix.

Closes: #1095133
---

14619c249978fc9a742d0216a5f60a12e2344df8
diff --cc debian/.git-dpm
index 19d65a50c57,00000000000..a3408d2d9c8
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 19206958c4d7349b174ea7acaf823037120155a4
- 19206958c4d7349b174ea7acaf823037120155a4
++bfb9e6519119430ffcc9c3c7b18e81512514ee2c
++bfb9e6519119430ffcc9c3c7b18e81512514ee2c
 +9757b93fb6528a86ed2543e8122d0d27f7419e6a
 +9757b93fb6528a86ed2543e8122d0d27f7419e6a
 +emacs_29.4+1.orig.tar.xz
 +004e7aa61b44ce33634eb1085299d206a90ad425
 +29301440
diff --cc debian/patches/0019-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch
index 00000000000,00000000000..dc3d88b9eba
new file mode 100644
--- /dev/null
+++ b/debian/patches/0019-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch
@@@ -1,0 -1,0 +1,24 @@@
++From bfb9e6519119430ffcc9c3c7b18e81512514ee2c Mon Sep 17 00:00:00 2001
++From: Xiyue Deng <manphiz@gmail.com>
++Date: Mon, 27 Jan 2025 23:23:37 -0800
++Subject: Fix eldoc warning in patch adding debian-emacs-flavor
++
++Forwarded: not-needed
++Closes: #1095133
++---
++ lisp/startup.el | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/lisp/startup.el b/lisp/startup.el
++index 5f14b585390..741d6ba049e 100644
++--- a/lisp/startup.el
+++++ b/lisp/startup.el
++@@ -440,7 +440,7 @@ tutorial-directory
++ 
++ (defconst debian-emacs-flavor 'emacs
++   "A symbol representing the particular debian flavor of emacs running.
++-Something like 'emacs, 'xemacs21, etc.")
+++Something like \\='emacs, \\='xemacs21, etc.")
++ 
++ (defun normal-top-level-add-subdirs-to-load-path ()
++   "Recursively add all subdirectories of `default-directory' to `load-path'.
diff --cc debian/patches/series
index 61a24de7119,00000000000..08405f05b13
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,18 -1,0 +1,19 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch
 +0010-Mark-test-undo-region-as-unstable.patch
 +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch
 +0012-Add-inhibit-native-compilation.patch
 +0013-Rename-to-inhibit-automatic-native-compilation.patch
 +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch
 +0015-Change-native-comp-async-jobs-number-default-to-1.patch
 +0016-Change-native-comp-async-report-warnings-errors-to-s.patch
 +0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch
 +0018-Disable-flymake-included-c-header-files-test-to-fix-.patch
++0019-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch