source: patches/readline-6.3-branch_update-2.patch@ 83b8f58

clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 83b8f58 was 83e4c6d, checked in by William Harrington <kb0iic@…>, 11 years ago

Add readline 6.3 branch update patch for level 5.
  • Property mode set to 100644
File size: 2.9 KB

  • readline-6.3 

    Submitted By: William Harrington (kb0iic at cross-lfs dot org)
Date: 03-30-2014
Initial Package Version: 6.3
Origin: Upstream
Upstream Status: Applied
Description: Contains all upstream patches up to 6.3-005

diff -Naur readline-6.3.orig/display.c readline-6.3/display.c
    old new  
    26772677{
    26782678  if (_rl_echoing_p)
    26792679    {
    2680       _rl_move_vert (_rl_vis_botlin);
     2680      if (_rl_vis_botlin > 0)   /* minor optimization plus bug fix */
     2681        _rl_move_vert (_rl_vis_botlin);
    26812682      _rl_vis_botlin = 0;
    26822683      fflush (rl_outstream);
    26832684      rl_restart_output (1, 0);

  • readline-6.3 

    diff -Naur readline-6.3.orig/readline.c readline-6.3/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

  • rltypedefs.h 

    diff -Naur readline-6.3.orig/rltypedefs.h readline-6.3/rltypedefs.h
    old new  
    2626extern "C" {
    2727#endif
    2828
     29/* Old-style, attempt to mark as deprecated in some way people will notice. */
     30
     31#if !defined (_FUNCTION_DEF)
     32#  define _FUNCTION_DEF
     33
     34#if defined(__GNUC__) || defined(__clang__)
     35typedef int Function () __attribute__ ((deprecated));
     36typedef void VFunction () __attribute__ ((deprecated));
     37typedef char *CPFunction () __attribute__ ((deprecated));
     38typedef char **CPPFunction () __attribute__ ((deprecated));
     39#else
     40typedef int Function ();
     41typedef void VFunction ();
     42typedef char *CPFunction ();
     43typedef char **CPPFunction ();
     44#endif
     45
     46#endif /* _FUNCTION_DEF */
     47
    2948/* New style. */
    3049
    3150#if !defined (_RL_FUNCTION_TYPEDEF)

  • readline-6.3 

    diff -Naur readline-6.3.orig/util.c readline-6.3/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)
Note: See TracBrowser for help on using the repository browser.