aaec1fbc68
Also fix an issue with dates not being in chronological order in changelog. Resolves: #2152991
26 lines
686 B
Diff
26 lines
686 B
Diff
diff --git a/builtins/read.def b/builtins/read.def
|
|
--- a/builtins/read.def
|
|
+++ b/builtins/read.def
|
|
@@ -167,6 +167,9 @@ reset_timeout ()
|
|
/* Cancel alarm before restoring signal handler. */
|
|
if (read_timeout)
|
|
shtimer_clear (read_timeout);
|
|
+#if defined (READLINE)
|
|
+ rl_clear_timeout ();
|
|
+#endif
|
|
read_timeout = 0;
|
|
}
|
|
|
|
diff --git a/patchlevel.h b/patchlevel.h
|
|
index 9ddc79f7..9ff902a0 100644
|
|
--- a/patchlevel.h
|
|
+++ b/patchlevel.h
|
|
@@ -25,6 +25,6 @@
|
|
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
|
looks for to find the patch level (for the sccs version string). */
|
|
|
|
-#define PATCHLEVEL 10
|
|
+#define PATCHLEVEL 11
|
|
|
|
#endif /* _PATCHLEVEL_H_ */
|