Bash-5.2 patch 26: fix typo when specifying readline's custom color prefix

[thirdparty/bash.git] / quit.h

diff --git a/quit.h b/quit.h
index 704a847069047c0256faef7ea4fb10ee73b728ac..0af1d121f9a69f999da9532635f854f4b78f8e78 100644 (file)
--- a/quit.h
+++ b/quit.h
@@ -1,6 +1,6 @@
 /* quit.h -- How to handle SIGINT gracefully. */
 
-/* Copyright (C) 1993-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -38,18 +38,14 @@ extern volatile sig_atomic_t terminating_signal;
     if (interrupt_state) throw_to_top_level (); \
   } while (0)
 
-#define CHECK_ALRM \
-  do { \
-    if (sigalrm_seen) \
-      longjmp (alrmbuf, 1); \
-  } while (0)
-
 #define SETINTERRUPT interrupt_state = 1
 #define CLRINTERRUPT interrupt_state = 0
 
 #define ADDINTERRUPT interrupt_state++
 #define DELINTERRUPT interrupt_state--
 
+#define ISINTERRUPT interrupt_state != 0
+
 /* The same sort of thing, this time just for signals that would ordinarily
    cause the shell to terminate. */
 
@@ -63,8 +59,8 @@ extern volatile sig_atomic_t terminating_signal;
 
 #define CHECK_WAIT_INTR \
   do { \
-    if (wait_signal_received && this_shell_builtin && (this_shell_builtin == wait_builtin)) \
-      longjmp (wait_intr_buf, 1); \
+    if (wait_intr_flag && wait_signal_received && this_shell_builtin && (this_shell_builtin == wait_builtin)) \
+      sh_longjmp (wait_intr_buf, 1); \
   } while (0)
 
 #define RESET_SIGTERM \