source:
patches/readline-6.0-branch_update-1.patch@
369d5d6
Last change on this file since 369d5d6 was 613a326, checked in by , 16 years ago | |
---|---|
|
|
File size: 3.5 KB |
-
readline-6.0
Submitted By: Jim Gifford (jim at cross-lfs dot org) Date: 06-05-2009 Initial Package Version: 6.0 Origin: Upstream Upstream Status: Applied Description: Contains all upstream patches up to 6.0-003 diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
old new 512 512 /* Block keyboard interrupts because this function manipulates global 513 513 data structures. */ 514 514 _rl_block_sigint (); 515 RL_SETSTATE (RL_STATE_REDISPLAYING); 515 516 516 517 if (!rl_display_prompt) 517 518 rl_display_prompt = ""; … … 1236 1237 visible_wrap_offset = wrap_offset; 1237 1238 } 1238 1239 1240 RL_UNSETSTATE (RL_STATE_REDISPLAYING); 1239 1241 _rl_release_sigint (); 1240 1242 } 1241 1243 … … 1772 1774 space_to_eol will insert too many spaces. XXX - maybe we should 1773 1775 adjust col_lendiff based on the difference between _rl_last_c_pos 1774 1776 and _rl_screenwidth */ 1775 if (col_lendiff && ( _rl_last_c_pos < _rl_screenwidth))1777 if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || (_rl_last_c_pos < _rl_screenwidth))) 1776 1778 #endif 1777 1779 { 1778 1780 if (_rl_term_autowrap && current_line < inv_botlin) … … 1892 1894 1893 1895 woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); 1894 1896 cpos = _rl_last_c_pos; 1897 1898 if (cpos == 0 && cpos == new) 1899 return; 1900 1895 1901 #if defined (HANDLE_MULTIBYTE) 1896 1902 /* If we have multibyte characters, NEW is indexed by the buffer point in 1897 1903 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 1906 1912 desired display position. */ 1907 1913 if ((new > prompt_last_invisible) || /* XXX - don't use woff here */ 1908 (prompt_physical_chars > _rl_screenwidth &&1914 (prompt_physical_chars >= _rl_screenwidth && 1909 1915 _rl_last_v_pos == prompt_last_screen_line && 1910 wrap_offset >= woff && 1916 wrap_offset >= woff && dpos >= woff && 1911 1917 new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset))) 1912 1918 /* XXX last comparison might need to be >= */ 1913 1919 { -
readline-6.0
diff -Naur readline-6.0.orig/patchlevel readline-6.0/patchlevel
old new 1 1 # Do not edit -- exists only for use by patch 2 2 3 0 3 3 -
readline-6.0
diff -Naur readline-6.0.orig/readline.h readline-6.0/readline.h
old new 814 814 #define RL_STATE_VIMOTION 0x100000 /* reading vi motion arg */ 815 815 #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */ 816 816 #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */ 817 #define RL_STATE_REDISPLAYING 0x800000 /* updating terminal display */ 817 818 818 #define RL_STATE_DONE 0x 800000 /* done; accepted line */819 #define RL_STATE_DONE 0x1000000 /* done; accepted line */ 819 820 820 821 #define RL_SETSTATE(x) (rl_readline_state |= (x)) 821 822 #define RL_UNSETSTATE(x) (rl_readline_state &= ~(x)) -
readline-6.0
diff -Naur readline-6.0.orig/terminal.c readline-6.0/terminal.c
old new 355 355 _rl_get_screen_size (fileno (rl_instream), 1); 356 356 if (CUSTOM_REDISPLAY_FUNC ()) 357 357 rl_forced_update_display (); 358 else 358 else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0) 359 359 _rl_redisplay_after_sigwinch (); 360 360 } 361 361 }
Note:
See TracBrowser
for help on using the repository browser.