[33e808a] | 1 | Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk) |
---|
| 2 | Date: 2012-02-18 |
---|
| 3 | Initial Package Version: 6.2 |
---|
| 4 | Origin: Upstream |
---|
| 5 | Upstream Status: Applied |
---|
| 6 | Description: Contains all upstream patches up to 6.2-002 |
---|
| 7 | |
---|
| 8 | diff -Naur readline-6.2.orig/callback.c readline-6.2/callback.c |
---|
| 9 | --- readline-6.2.orig/callback.c 2010-06-06 16:18:58.000000000 +0000 |
---|
| 10 | +++ readline-6.2/callback.c 2012-02-18 17:48:12.328431655 +0000 |
---|
| 11 | @@ -148,6 +148,9 @@ |
---|
| 12 | eof = _rl_vi_domove_callback (_rl_vimvcxt); |
---|
| 13 | /* Should handle everything, including cleanup, numeric arguments, |
---|
| 14 | and turning off RL_STATE_VIMOTION */ |
---|
| 15 | + if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) |
---|
| 16 | + _rl_internal_char_cleanup (); |
---|
| 17 | + |
---|
| 18 | return; |
---|
| 19 | } |
---|
| 20 | #endif |
---|
| 21 | diff -Naur readline-6.2.orig/patchlevel readline-6.2/patchlevel |
---|
| 22 | --- readline-6.2.orig/patchlevel 2010-01-14 15:15:52.000000000 +0000 |
---|
| 23 | +++ readline-6.2/patchlevel 2012-02-18 17:48:13.720468594 +0000 |
---|
| 24 | @@ -1,3 +1,3 @@ |
---|
| 25 | # Do not edit -- exists only for use by patch |
---|
| 26 | |
---|
| 27 | -1 |
---|
| 28 | +2 |
---|
| 29 | diff -Naur readline-6.2.orig/support/shobj-conf readline-6.2/support/shobj-conf |
---|
| 30 | --- readline-6.2.orig/support/shobj-conf 2009-10-28 13:20:21.000000000 +0000 |
---|
| 31 | +++ readline-6.2/support/shobj-conf 2012-02-18 17:48:13.720468594 +0000 |
---|
| 32 | @@ -157,7 +157,7 @@ |
---|
| 33 | ;; |
---|
| 34 | |
---|
| 35 | # Darwin/MacOS X |
---|
| 36 | -darwin[89]*|darwin10*) |
---|
| 37 | +darwin[89]*|darwin1[012]*) |
---|
| 38 | SHOBJ_STATUS=supported |
---|
| 39 | SHLIB_STATUS=supported |
---|
| 40 | |
---|
| 41 | @@ -186,7 +186,7 @@ |
---|
| 42 | SHLIB_LIBSUFF='dylib' |
---|
| 43 | |
---|
| 44 | case "${host_os}" in |
---|
| 45 | - darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' |
---|
| 46 | + darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' |
---|
| 47 | SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' |
---|
| 48 | ;; |
---|
| 49 | *) SHOBJ_LDFLAGS='-dynamic' |
---|
| 50 | diff -Naur readline-6.2.orig/vi_mode.c readline-6.2/vi_mode.c |
---|
| 51 | --- readline-6.2.orig/vi_mode.c 2010-11-21 00:51:39.000000000 +0000 |
---|
| 52 | +++ readline-6.2/vi_mode.c 2012-02-18 17:48:12.328431655 +0000 |
---|
| 53 | @@ -1114,7 +1114,7 @@ |
---|
| 54 | rl_beg_of_line (1, c); |
---|
| 55 | _rl_vi_last_motion = c; |
---|
| 56 | RL_UNSETSTATE (RL_STATE_VIMOTION); |
---|
| 57 | - return (0); |
---|
| 58 | + return (vidomove_dispatch (m)); |
---|
| 59 | } |
---|
| 60 | #if defined (READLINE_CALLBACKS) |
---|
| 61 | /* XXX - these need to handle rl_universal_argument bindings */ |
---|