source: patches/readline-6.2-branch_update-3.patch@ c6faf0f

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since c6faf0f was 8c5edb4, checked in by William Harrington <kb0iic@…>, 12 years ago

Create readline 6.2 level 004 patch.
  • Property mode set to 100644
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  
    148148          eof = _rl_vi_domove_callback (_rl_vimvcxt);
    149149          /* Should handle everything, including cleanup, numeric arguments,
    150150             and turning off RL_STATE_VIMOTION */
     151          if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
     152            _rl_internal_char_cleanup ();
     153
    151154          return;
    152155        }
    153156#endif

  • readline-6.2 

    diff -Naur readline-6.2.orig/input.c readline-6.2/input.c
    old new  
    409409int
    410410rl_read_key ()
    411411{
    412   int c;
     412  int c, r;
    413413
    414414  rl_key_sequence_length++;
    415415
    … …  
    429429        {
    430430          while (rl_event_hook)
    431431            {
    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 */
    433436                {
    434437                  rl_done = 1;
    435438                  return ('\n');
    436439                }
     440              else if (r == 1)                  /* read something */
     441                continue;
     442
    437443              RL_CHECK_SIGNALS ();
    438               if (rl_get_char (&c) != 0)
    439                 break;
    440444              if (rl_done)              /* XXX - experimental */
    441445                return ('\n');
    442446              (*rl_event_hook) ();

  • readline-6.2 

    diff -Naur readline-6.2.orig/patchlevel readline-6.2/patchlevel
    old new  
    11# Do not edit -- exists only for use by patch
    22
    3 1
     34

  • support/shobj-conf 

    diff -Naur readline-6.2.orig/support/shobj-conf readline-6.2/support/shobj-conf
    old new  
    157157        ;;
    158158
    159159# Darwin/MacOS X
    160 darwin[89]*|darwin10*)
     160darwin[89]*|darwin1[012]*)
    161161        SHOBJ_STATUS=supported
    162162        SHLIB_STATUS=supported
    163163       
    … …  
    186186        SHLIB_LIBSUFF='dylib'
    187187
    188188        case "${host_os}" in
    189         darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
     189        darwin[789]*|darwin1[012]*)     SHOBJ_LDFLAGS=''
    190190                        SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
    191191                        ;;
    192192        *)              SHOBJ_LDFLAGS='-dynamic'

  • readline-6.2 

    diff -Naur readline-6.2.orig/vi_mode.c readline-6.2/vi_mode.c
    old new  
    11141114      rl_beg_of_line (1, c);
    11151115      _rl_vi_last_motion = c;
    11161116      RL_UNSETSTATE (RL_STATE_VIMOTION);
    1117       return (0);
     1117      return (vidomove_dispatch (m));
    11181118    }
    11191119#if defined (READLINE_CALLBACKS)
    11201120  /* XXX - these need to handle rl_universal_argument bindings */
    … …  
    12341234      _rl_vimvcxt->motion = '$';
    12351235      r = rl_domove_motion_callback (_rl_vimvcxt);
    12361236    }
    1237   else if (vi_redoing)
     1237  else if (vi_redoing && _rl_vi_last_motion != 'd')     /* `dd' is special */
    12381238    {
    12391239      _rl_vimvcxt->motion = _rl_vi_last_motion;
    12401240      r = rl_domove_motion_callback (_rl_vimvcxt);
    12411241    }
     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    }
    12421250#if defined (READLINE_CALLBACKS)
    12431251  else if (RL_ISSTATE (RL_STATE_CALLBACK))
    12441252    {
    … …  
    13161324      _rl_vimvcxt->motion = '$';
    13171325      r = rl_domove_motion_callback (_rl_vimvcxt);
    13181326    }
    1319   else if (vi_redoing)
     1327  else if (vi_redoing && _rl_vi_last_motion != 'c')     /* `cc' is special */
    13201328    {
    13211329      _rl_vimvcxt->motion = _rl_vi_last_motion;
    13221330      r = rl_domove_motion_callback (_rl_vimvcxt);
    13231331    }
     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    }
    13241340#if defined (READLINE_CALLBACKS)
    13251341  else if (RL_ISSTATE (RL_STATE_CALLBACK))
    13261342    {
    … …  
    13771393      _rl_vimvcxt->motion = '$';
    13781394      r = rl_domove_motion_callback (_rl_vimvcxt);
    13791395    }
     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    }
    13801409#if defined (READLINE_CALLBACKS)
    13811410  else if (RL_ISSTATE (RL_STATE_CALLBACK))
    13821411    {
Note: See TracBrowser for help on using the repository browser.