source: patches/readline-6.0-branch_update-1.patch@ 0053d13

readline-6.0

@@ -512 +512 @@
   /* Block keyboard interrupts because this function manipulates global
      data structures. */
   _rl_block_sigint ();  
+  RL_SETSTATE (RL_STATE_REDISPLAYING);
 
   if (!rl_display_prompt)
     rl_display_prompt = "";
@@ -1236 +1237 @@
       visible_wrap_offset = wrap_offset;
   }
 
+  RL_UNSETSTATE (RL_STATE_REDISPLAYING);
   _rl_release_sigint ();
 }
 
@@ -1772 +1774 @@
              space_to_eol will insert too many spaces.  XXX - maybe we should
              adjust col_lendiff based on the difference between _rl_last_c_pos
              and _rl_screenwidth */
-          if (col_lendiff && (_rl_last_c_pos < _rl_screenwidth))
+          if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || (_rl_last_c_pos < _rl_screenwidth)))
 #endif
             {     
               if (_rl_term_autowrap && current_line < inv_botlin)
@@ -1892 +1894 @@
 
   woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
   cpos = _rl_last_c_pos;
+
+  if (cpos == 0 && cpos == new)
+    return;
+
 #if defined (HANDLE_MULTIBYTE)
   /* If we have multibyte characters, NEW is indexed by the buffer point in
      a multibyte string, but _rl_last_c_pos is the display position.  In
@@ -1905 +1911 @@
          prompt string, since they're both buffer indices and DPOS is a
          desired display position. */
       if ((new > prompt_last_invisible) ||              /* XXX - don't use woff here */
-          (prompt_physical_chars > _rl_screenwidth &&
+          (prompt_physical_chars >= _rl_screenwidth &&
            _rl_last_v_pos == prompt_last_screen_line &&
-           wrap_offset >= woff &&
+           wrap_offset >= woff && dpos >= woff &&
            new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
            /* XXX last comparison might need to be >= */
         {

readline-6.0

@@ -1 +1 @@
 # Do not edit -- exists only for use by patch
 
-0
+3

readline-6.0

@@ -814 +814 @@
 #define RL_STATE_VIMOTION       0x100000        /* reading vi motion arg */
 #define RL_STATE_MULTIKEY       0x200000        /* reading multiple-key command */
 #define RL_STATE_VICMDONCE      0x400000        /* entered vi command mode at least once */
+#define RL_STATE_REDISPLAYING   0x800000        /* updating terminal display */
 
-#define RL_STATE_DONE           0x800000        /* done; accepted line */
+#define RL_STATE_DONE           0x1000000       /* done; accepted line */
 
 #define RL_SETSTATE(x)          (rl_readline_state |= (x))
 #define RL_UNSETSTATE(x)        (rl_readline_state &= ~(x))

readline-6.0

@@ -355 +355 @@
       _rl_get_screen_size (fileno (rl_instream), 1);
       if (CUSTOM_REDISPLAY_FUNC ())
         rl_forced_update_display ();
-      else
+      else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
         _rl_redisplay_after_sigwinch ();
     }
 }