[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a03de1e: Prevent segfaults when running inside dock
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master a03de1e: Prevent segfaults when running inside docker |
Date: |
Wed, 6 Feb 2019 10:32:35 -0500 (EST) |
branch: master
commit a03de1e2a33a35caf2715b2645aef0a52072b4b2
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Prevent segfaults when running inside docker
* src/coding.c (syms_of_coding): New symbol Qus_ascii.
(reset_coding_after_pdumper_load): Call
set-safe-terminal-system-internal to set up
safe_terminal_coding after restoring from pdump file.
Reported by Philippe Vaucher <address@hidden>.
---
src/coding.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/coding.c b/src/coding.c
index 6de8dcd..e470757 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10831,6 +10831,7 @@ syms_of_coding (void)
DEFSYM (Qundecided, "undecided");
DEFSYM (Qno_conversion, "no-conversion");
DEFSYM (Qraw_text, "raw-text");
+ DEFSYM (Qus_ascii, "us-ascii");
DEFSYM (Qiso_2022, "iso-2022");
@@ -11341,4 +11342,9 @@ reset_coding_after_pdumper_load (void)
setup_coding_system (CODING_ID_NAME (id), this);
}
}
+ /* In temacs the below is done by mule-conf.el, because we need to
+ define us-ascii first. But in dumped Emacs us-ascii is restored
+ by the above loop, and mule-conf.el will not be loaded, so we set
+ it up now; otherwise safe_terminal_coding will remain zeroed. */
+ Fset_safe_terminal_coding_system_internal (Qus_ascii);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a03de1e: Prevent segfaults when running inside docker,
Eli Zaretskii <=