aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/29.1/01_all_xdisp-segfault.patch')
-rw-r--r--emacs/29.1/01_all_xdisp-segfault.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/emacs/29.1/01_all_xdisp-segfault.patch b/emacs/29.1/01_all_xdisp-segfault.patch
deleted file mode 100644
index 835185b..0000000
--- a/emacs/29.1/01_all_xdisp-segfault.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix segmentation fault due to invalid mode-line-format
-Patch backported from master branch
-https://debbugs.gnu.org/64893
-
-commit 7ea3f39deec3d54914077455e70605a14eb7d200
-Author: Eli Zaretskii <eliz@gnu.org>
-Date: Thu Jul 27 15:34:38 2023 +0300
-
- Avoid crashes due to invalid 'mode-line-format'
-
- * src/xdisp.c (display_mode_element, redisplay_window_error):
- Don't take XCAR of what can be Qnil. (Bug#64893)
-
---- emacs-29.1/src/xdisp.c
-+++ emacs-29.1/src/xdisp.c
-@@ -17601,6 +17601,7 @@ redisplay_window_error (Lisp_Object erro
- if (max_redisplay_ticks > 0
- && CONSP (error_data)
- && EQ (XCAR (error_data), Qerror)
-+ && CONSP (XCDR (error_data))
- && STRINGP (XCAR (XCDR (error_data))))
- Vdelayed_warnings_list = Fcons (list2 (XCAR (error_data),
- XCAR (XCDR (error_data))),
-@@ -27091,7 +27092,7 @@ display_mode_element (struct it *it, int
-
- oprops = Fcopy_sequence (oprops);
- tem = props;
-- while (CONSP (tem))
-+ while (CONSP (tem) && CONSP (XCDR (tem)))
- {
- oprops = plist_put (oprops, XCAR (tem),
- XCAR (XCDR (tem)));