updated for version 7.2-130
diff --git a/src/auto/configure b/src/auto/configure
index fba78af..aea0013 100755
--- a/src/auto/configure
+++ b/src/auto/configure
Binary files differ
diff --git a/src/config.h.in b/src/config.h.in
index d1fb8d1..900aef8 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -50,6 +50,9 @@
/* Define to empty if the keyword does not work. */
#undef const
+/* Define to empty if the keyword does not work. */
+#undef volatile
+
/* Define to `int' if <sys/types.h> doesn't define. */
#undef mode_t
diff --git a/src/configure.in b/src/configure.in
index b6c77da..ff1bd0c 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2148,6 +2148,7 @@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_PROG_GCC_TRADITIONAL
AC_C_CONST
+AC_C_VOLATILE
AC_TYPE_MODE_T
AC_TYPE_OFF_T
AC_TYPE_PID_T
diff --git a/src/globals.h b/src/globals.h
index 2125f4a..3236a1e 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -482,8 +482,10 @@
/*
* While executing external commands or in Ex mode, should not insert GUI
* events in the input buffer: Set hold_gui_events to non-zero.
+ *
+ * volatile because it is used in signal handler sig_sysmouse().
*/
-EXTERN int hold_gui_events INIT(= 0);
+EXTERN volatile int hold_gui_events INIT(= 0);
/*
* When resizing the shell is postponed, remember the new size, and call
@@ -597,7 +599,8 @@
EXTERN int really_exiting INIT(= FALSE);
/* TRUE when we are sure to exit, e.g., after
* a deadly signal */
-EXTERN int full_screen INIT(= FALSE);
+/* volatile because it is used in signal handler deathtrap(). */
+EXTERN volatile int full_screen INIT(= FALSE);
/* TRUE when doing full-screen output
* otherwise only writing some messages */
@@ -739,10 +742,12 @@
*/
EXTERN JMP_BUF lc_jump_env; /* argument to SETJMP() */
# ifdef SIGHASARG
-EXTERN int lc_signal; /* catched signal number, 0 when no was signal
- catched; used for mch_libcall() */
+/* volatile because it is used in signal handlers. */
+EXTERN volatile int lc_signal; /* caught signal number, 0 when no was signal
+ caught; used for mch_libcall() */
# endif
-EXTERN int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */
+/* volatile because it is used in signal handler deathtrap(). */
+EXTERN volatile int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */
#endif
#if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT)
@@ -986,7 +991,8 @@
EXTERN FILE *scriptout INIT(= NULL); /* stream to write script to */
EXTERN int read_cmd_fd INIT(= 0); /* fd to read commands from */
-EXTERN int got_int INIT(= FALSE); /* set to TRUE when interrupt
+/* volatile because it is used in signal handler catch_sigint(). */
+EXTERN volatile int got_int INIT(= FALSE); /* set to TRUE when interrupt
signal occurred */
#ifdef USE_TERM_CONSOLE
EXTERN int term_console INIT(= FALSE); /* set to TRUE when console used */
diff --git a/src/os_unix.c b/src/os_unix.c
index 36872ad..703b932 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -181,7 +181,8 @@
&& defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK)
# define SET_SIG_ALARM
static RETSIGTYPE sig_alarm __ARGS(SIGPROTOARG);
-static int sig_alarm_called;
+/* volatile because it is used in signal handler sig_alarm(). */
+static volatile int sig_alarm_called;
#endif
static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG);
@@ -201,13 +202,16 @@
# define SIG_ERR ((RETSIGTYPE (*)())-1)
#endif
-static int do_resize = FALSE;
+/* volatile because it is used in signal handler sig_winch(). */
+static volatile int do_resize = FALSE;
#ifndef __EMX__
static char_u *extra_shell_arg = NULL;
static int show_shell_mess = TRUE;
#endif
-static int deadly_signal = 0; /* The signal we caught */
-static int in_mch_delay = FALSE; /* sleeping in mch_delay() */
+/* volatile because it is used in signal handler deathtrap(). */
+static volatile int deadly_signal = 0; /* The signal we caught */
+/* volatile because it is used in signal handler deathtrap(). */
+static volatile int in_mch_delay = FALSE; /* sleeping in mch_delay() */
static int curr_tmode = TMODE_COOK; /* contains current terminal mode */
@@ -802,7 +806,7 @@
#endif
/*
- * We need correct potatotypes for a signal function, otherwise mean compilers
+ * We need correct prototypes for a signal function, otherwise mean compilers
* will barf when the second argument to signal() is ``wrong''.
* Let me try it with a few tricky defines from my own osdef.h (jw).
*/
@@ -1068,13 +1072,18 @@
SIGRETURN;
}
-#ifdef _REENTRANT
+#if defined(_REENTRANT) && defined(SIGCONT)
/*
* On Solaris with multi-threading, suspending might not work immediately.
* Catch the SIGCONT signal, which will be used as an indication whether the
* suspending has been done or not.
+ *
+ * On Linux, signal is not always handled immediately either.
+ * See https://bugs.launchpad.net/bugs/291373
+ *
+ * volatile because it is used in in signal handler sigcont_handler().
*/
-static int sigcont_received;
+static volatile int sigcont_received;
static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG);
/*
@@ -1118,15 +1127,28 @@
}
# endif
-# ifdef _REENTRANT
+# if defined(_REENTRANT) && defined(SIGCONT)
sigcont_received = FALSE;
# endif
kill(0, SIGTSTP); /* send ourselves a STOP signal */
-# ifdef _REENTRANT
- /* When we didn't suspend immediately in the kill(), do it now. Happens
- * on multi-threaded Solaris. */
- if (!sigcont_received)
- pause();
+# if defined(_REENTRANT) && defined(SIGCONT)
+ /*
+ * Wait for the SIGCONT signal to be handled. It generally happens
+ * immediately, but somehow not all the time. Do not call pause()
+ * because there would be race condition which would hang Vim if
+ * signal happened in between the test of sigcont_received and the
+ * call to pause(). If signal is not yet received, call sleep(0)
+ * to just yield CPU. Signal should then be received. If somehow
+ * it's still not received, sleep 1, 2, 3 ms. Don't bother waiting
+ * further if signal is not received after 1+2+3+4 ms (not expected
+ * to happen).
+ */
+ {
+ long wait;
+ for (wait = 0; !sigcont_received && wait <= 3L; wait++)
+ /* Loop is not entered most of the time */
+ mch_delay(wait, FALSE);
+ }
# endif
# ifdef FEAT_TITLE
@@ -1175,7 +1197,7 @@
#ifdef SIGTSTP
signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
#endif
-#ifdef _REENTRANT
+#if defined(_REENTRANT) && defined(SIGCONT)
signal(SIGCONT, sigcont_handler);
#endif
@@ -1234,7 +1256,7 @@
reset_signals()
{
catch_signals(SIG_DFL, SIG_DFL);
-#ifdef _REENTRANT
+#if defined(_REENTRANT) && defined(SIGCONT)
/* SIGCONT isn't in the list, because its default action is ignore */
signal(SIGCONT, SIG_DFL);
#endif
@@ -5899,7 +5921,9 @@
* we are going to suspend or starting an external process
* so we shouldn't have problem with this
*/
+# ifdef SIGTSTP
signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
+# endif
return 1; /* succeed */
}
if (gpm_fd == -2)
diff --git a/src/version.c b/src/version.c
index 8557480..b002278 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 130,
+/**/
129,
/**/
128,
