Ticket #3532: readline-6.3-fixes-1.patch

File readline-6.3-fixes-1.patch, 1.7 KB (added by Miklos Karacsony, 10 years ago)

Cumulative patch (readline-6.3 patchlevel 3)

  • readline-6.3 

    diff -U 3 -H -d -r -N -- readline-6.3/patchlevel readline-6.3.mod/patchlevel
    old new  
    11# Do not edit -- exists only for use by patch
    22
    3 5
     33

  • readline-6.3 

    diff -U 3 -H -d -r -N -- readline-6.3/readline.c readline-6.3.mod/readline.c
    old new  
    744744    r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
    745745
    746746  RL_CHECK_SIGNALS ();
    747   if (r == 0)                   /* success! */
     747  /* We only treat values < 0 specially to simulate recursion. */
     748  if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))   /* success! or failure! */
    748749    {
    749750      _rl_keyseq_chain_dispose ();
    750751      RL_UNSETSTATE (RL_STATE_MULTIKEY);
    … …  
    964965#if defined (VI_MODE)
    965966  if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
    966967      key != ANYOTHERKEY &&
    967       rl_key_sequence_length == 1 &&    /* XXX */
     968      _rl_dispatching_keymap == vi_movement_keymap &&
    968969      _rl_vi_textmod_command (key))
    969970    _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
    970971#endif

  • readline-6.3 

    diff -U 3 -H -d -r -N -- readline-6.3/util.c readline-6.3.mod/util.c
    old new  
    476476  return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));
    477477}
    478478
     479#if defined (DEBUG)
    479480#if defined (USE_VARARGS)
    480481static FILE *_rl_tracefp;
    481482
    … …  
    538539  _rl_tracefp = fp;
    539540}
    540541#endif
     542#endif /* DEBUG */
    541543
    542544
    543545#if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT)