source:
patches/readline-6.2-branch_update-3.patch@
51ae025
Last change on this file since 51ae025 was 8c5edb4, checked in by , 12 years ago | |
---|---|
|
|
File size: 4.9 KB |
-
readline-6.2
Submitted By: William Harrington (kb0iic at cross-lfs dot org) Date: 2012-11-01 Initial Package Version: 6.2 Origin: Upstream Upstream Status: Applied Description: Contains all upstream patches up to 6.2-004 diff -Naur readline-6.2.orig/callback.c readline-6.2/callback.c
old new 148 148 eof = _rl_vi_domove_callback (_rl_vimvcxt); 149 149 /* Should handle everything, including cleanup, numeric arguments, 150 150 and turning off RL_STATE_VIMOTION */ 151 if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) 152 _rl_internal_char_cleanup (); 153 151 154 return; 152 155 } 153 156 #endif -
readline-6.2
diff -Naur readline-6.2.orig/input.c readline-6.2/input.c
old new 409 409 int 410 410 rl_read_key () 411 411 { 412 int c ;412 int c, r; 413 413 414 414 rl_key_sequence_length++; 415 415 … … 429 429 { 430 430 while (rl_event_hook) 431 431 { 432 if (rl_gather_tyi () < 0) /* XXX - EIO */ 432 if (rl_get_char (&c) != 0) 433 break; 434 435 if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ 433 436 { 434 437 rl_done = 1; 435 438 return ('\n'); 436 439 } 440 else if (r == 1) /* read something */ 441 continue; 442 437 443 RL_CHECK_SIGNALS (); 438 if (rl_get_char (&c) != 0)439 break;440 444 if (rl_done) /* XXX - experimental */ 441 445 return ('\n'); 442 446 (*rl_event_hook) (); -
readline-6.2
diff -Naur readline-6.2.orig/patchlevel readline-6.2/patchlevel
old new 1 1 # Do not edit -- exists only for use by patch 2 2 3 1 3 4 -
support/shobj-conf
diff -Naur readline-6.2.orig/support/shobj-conf readline-6.2/support/shobj-conf
old new 157 157 ;; 158 158 159 159 # Darwin/MacOS X 160 darwin[89]*|darwin1 0*)160 darwin[89]*|darwin1[012]*) 161 161 SHOBJ_STATUS=supported 162 162 SHLIB_STATUS=supported 163 163 … … 186 186 SHLIB_LIBSUFF='dylib' 187 187 188 188 case "${host_os}" in 189 darwin[789]*|darwin1 0*) SHOBJ_LDFLAGS=''189 darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' 190 190 SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' 191 191 ;; 192 192 *) SHOBJ_LDFLAGS='-dynamic' -
readline-6.2
diff -Naur readline-6.2.orig/vi_mode.c readline-6.2/vi_mode.c
old new 1114 1114 rl_beg_of_line (1, c); 1115 1115 _rl_vi_last_motion = c; 1116 1116 RL_UNSETSTATE (RL_STATE_VIMOTION); 1117 return ( 0);1117 return (vidomove_dispatch (m)); 1118 1118 } 1119 1119 #if defined (READLINE_CALLBACKS) 1120 1120 /* XXX - these need to handle rl_universal_argument bindings */ … … 1234 1234 _rl_vimvcxt->motion = '$'; 1235 1235 r = rl_domove_motion_callback (_rl_vimvcxt); 1236 1236 } 1237 else if (vi_redoing )1237 else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */ 1238 1238 { 1239 1239 _rl_vimvcxt->motion = _rl_vi_last_motion; 1240 1240 r = rl_domove_motion_callback (_rl_vimvcxt); 1241 1241 } 1242 else if (vi_redoing) /* handle redoing `dd' here */ 1243 { 1244 _rl_vimvcxt->motion = _rl_vi_last_motion; 1245 rl_mark = rl_end; 1246 rl_beg_of_line (1, key); 1247 RL_UNSETSTATE (RL_STATE_VIMOTION); 1248 r = vidomove_dispatch (_rl_vimvcxt); 1249 } 1242 1250 #if defined (READLINE_CALLBACKS) 1243 1251 else if (RL_ISSTATE (RL_STATE_CALLBACK)) 1244 1252 { … … 1316 1324 _rl_vimvcxt->motion = '$'; 1317 1325 r = rl_domove_motion_callback (_rl_vimvcxt); 1318 1326 } 1319 else if (vi_redoing )1327 else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */ 1320 1328 { 1321 1329 _rl_vimvcxt->motion = _rl_vi_last_motion; 1322 1330 r = rl_domove_motion_callback (_rl_vimvcxt); 1323 1331 } 1332 else if (vi_redoing) /* handle redoing `cc' here */ 1333 { 1334 _rl_vimvcxt->motion = _rl_vi_last_motion; 1335 rl_mark = rl_end; 1336 rl_beg_of_line (1, key); 1337 RL_UNSETSTATE (RL_STATE_VIMOTION); 1338 r = vidomove_dispatch (_rl_vimvcxt); 1339 } 1324 1340 #if defined (READLINE_CALLBACKS) 1325 1341 else if (RL_ISSTATE (RL_STATE_CALLBACK)) 1326 1342 { … … 1377 1393 _rl_vimvcxt->motion = '$'; 1378 1394 r = rl_domove_motion_callback (_rl_vimvcxt); 1379 1395 } 1396 else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */ 1397 { 1398 _rl_vimvcxt->motion = _rl_vi_last_motion; 1399 r = rl_domove_motion_callback (_rl_vimvcxt); 1400 } 1401 else if (vi_redoing) /* handle redoing `yy' here */ 1402 { 1403 _rl_vimvcxt->motion = _rl_vi_last_motion; 1404 rl_mark = rl_end; 1405 rl_beg_of_line (1, key); 1406 RL_UNSETSTATE (RL_STATE_VIMOTION); 1407 r = vidomove_dispatch (_rl_vimvcxt); 1408 } 1380 1409 #if defined (READLINE_CALLBACKS) 1381 1410 else if (RL_ISSTATE (RL_STATE_CALLBACK)) 1382 1411 {
Note:
See TracBrowser
for help on using the repository browser.