diff src/readline-1-sigwinch.patch @ 6516:5ef7d51c2195

readline: Update to version 8.2-001. * src/readline.mk: Update version and checksum. * src/readline-0-001-upstream.patch: Upstream patch re-formatted to apply in MXE Octave. See: https://ftp.gnu.org/pub/gnu/readline/readline-8.2-patches/readline82-001 * src/readline-0-002-upstream.patch: Remove upstream patch for previous version. * src/readline-1-input.patch, src/readline-1-sigwinch.patch: Update patches. * src/readline-3-fd_set.patch: Add patch to guard functions that use types that aren't available on Windows. * src/gdb-1-readline-8.2.patch: Cherry-pick upstream patch. * dist-files.mk: Update files in list.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 12 Nov 2022 17:00:41 +0100
parents 41e50d658de0
children
line wrap: on
line diff
--- a/src/readline-1-sigwinch.patch	Sat Nov 12 14:34:47 2022 +0100
+++ b/src/readline-1-sigwinch.patch	Sat Nov 12 17:00:41 2022 +0100
@@ -1,18 +1,18 @@
 diff -ur readline-8.1.2/readline.c readline-8.1.3/readline.c
 --- readline-8.1.2/readline.c	2020-12-19 07:55:06.477760951 -0500
 +++ readline-8.1.3/readline.c	2020-12-19 07:56:17.722659252 -0500
-@@ -1154,8 +1154,12 @@
+@@ -1186,8 +1186,13 @@
        RL_SETSTATE(RL_STATE_INITIALIZED);
      }
    else
--    (void)_rl_init_locale ();	/* check current locale */
--
+-    _rl_reset_locale ();	/* check current locale and set locale variables */
 +    {
-+      (void)_rl_init_locale ();	/* check current locale */
++      _rl_reset_locale ();	/* check current locale and set locale variables */
 +#if defined (__MINGW32__)
 +      rl_reset_screen_size ();
 +#endif      
 +    }
+ 
    /* Initialize the current line information. */
    _rl_init_line_state ();
  
@@ -41,17 +41,6 @@
  int rl_catch_sigwinch = 1;
  #else
  int rl_catch_sigwinch = 0;	/* for the readline state struct in readline.c */
-@@ -266,8 +271,10 @@
-     case SIGQUIT:
- #endif
- 
-+#if defined (HAVE_POSIX_SIGNALS)
-       if (block_sig)
- 	sigprocmask (SIG_BLOCK, &set, &oset);
-+#endif
- 
-       rl_echo_signal_char (sig);
-       rl_cleanup_after_signal ();
 @@ -532,6 +539,21 @@
      }
  #endif /* SIGWINCH */