aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2024-08-16 17:20:58 -0700
committerPaul Eggert2024-08-16 21:16:36 -0700
commita967efdd2a5b77e35657f9bdd7098b79241e3aa5 (patch)
treed09eafaaadb5dc2b6e0197dd5cbe487cd29b7ba3 /src
parent3b24ac538858d994a74826361a1af3f802dd065a (diff)
downloademacs-a967efdd2a5b77e35657f9bdd7098b79241e3aa5.tar.gz
emacs-a967efdd2a5b77e35657f9bdd7098b79241e3aa5.zip
Don’t ignore -Wclobbered in keyboard.c
This fixes Emacs bug#71744. * src/keyboard.c: Do not ignore -Wclobbered. (read_char): Fix violation of the C standard, where setjmp clobbered c. Fix suggested by Pip Cet in <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71744#38>
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index b312d529e59..b519ccdf9f0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -88,11 +88,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
88#include TERM_HEADER 88#include TERM_HEADER
89#endif /* HAVE_WINDOW_SYSTEM */ 89#endif /* HAVE_WINDOW_SYSTEM */
90 90
91/* Work around GCC bug 54561. */
92#if GNUC_PREREQ (4, 3, 0)
93# pragma GCC diagnostic ignored "-Wclobbered"
94#endif
95
96#ifdef WINDOWSNT 91#ifdef WINDOWSNT
97char const DEV_TTY[] = "CONOUT$"; 92char const DEV_TTY[] = "CONOUT$";
98#else 93#else
@@ -2522,7 +2517,7 @@ read_char (int commandflag, Lisp_Object map,
2522 Lisp_Object prev_event, 2517 Lisp_Object prev_event,
2523 bool *used_mouse_menu, struct timespec *end_time) 2518 bool *used_mouse_menu, struct timespec *end_time)
2524{ 2519{
2525 Lisp_Object c; 2520 Lisp_Object volatile c;
2526 sys_jmp_buf local_getcjmp; 2521 sys_jmp_buf local_getcjmp;
2527 sys_jmp_buf save_jump; 2522 sys_jmp_buf save_jump;
2528 Lisp_Object tem, save; 2523 Lisp_Object tem, save;