source: patches/readline-6.3-branch_update-3.patch @ 8b8c815

clfs-3.0.0-systemdsystemd
Last change on this file since 8b8c815 was 8b8c815, checked in by William Harrington <kb0iic@…>, 6 years ago

Replace readline 6.3 level 5 patch with level 6 patch.

  • Property mode set to 100644
File size: 4.1 KB
  • readline-6.3

    Submitted By: William Harrington (kb0iic at cross-lfs dot org)
    Date: 05-17-2014
    Initial Package Version: 6.3
    Origin: Upstream
    Upstream Status: Applied
    Description: Contains all upstream patches up to 6.3-006
    
    diff -Naur readline-6.3.orig/display.c readline-6.3/display.c
    old new  
    16371637  /* If we are changing the number of invisible characters in a line, and
    16381638     the spot of first difference is before the end of the invisible chars,
    16391639     lendiff needs to be adjusted. */
    1640   if (current_line == 0 && !_rl_horizontal_scroll_mode &&
     1640  if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
    16411641      current_invis_chars != visible_wrap_offset)
    16421642    {
    16431643      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
     
    18251825              else
    18261826                _rl_last_c_pos += bytes_to_insert;
    18271827
     1828              /* XXX - we only want to do this if we are at the end of the line
     1829                 so we move there with _rl_move_cursor_relative */
    18281830              if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
    1829                 goto clear_rest_of_line;
     1831                {
     1832                  _rl_move_cursor_relative (ne-new, new);
     1833                  goto clear_rest_of_line;
     1834                }
    18301835            }
    18311836        }
    18321837      /* Otherwise, print over the existing material. */
     
    26772682{
    26782683  if (_rl_echoing_p)
    26792684    {
    2680       _rl_move_vert (_rl_vis_botlin);
     2685      if (_rl_vis_botlin > 0)   /* minor optimization plus bug fix */
     2686        _rl_move_vert (_rl_vis_botlin);
    26812687      _rl_vis_botlin = 0;
    26822688      fflush (rl_outstream);
    26832689      rl_restart_output (1, 0);
  • readline-6.3

    diff -Naur readline-6.3.orig/patchlevel readline-6.3/patchlevel
    old new  
    11# Do not edit -- exists only for use by patch
    22
    3 5
     36
  • 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.