source: scripts/patches/readline-5.1-fixes-2.patch@ d789594

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since d789594 was 46f79ff, checked in by Jim Gifford <clfs@…>, 19 years ago

r2511@server (orig r1250): ryan | 2006-03-10 02:08:45 -0800

r1300@rei: lfs | 2006-03-09 18:59:02 +1100
Add readline-5.1-fixes-2.patch
------------------------------
Submitted By: Jim Gifford (patches at jg555 dot com)
Date: 2006-02-06
Initial Package Version: 5.1
Origin: Upstream
Upstream Status: Applied
Description: Contains Patch 001-002 from Upstream
  • Property mode set to 100644
File size: 2.1 KB

  • readline-5.1 

    Submitted By: Jim Gifford (patches at jg555 dot com)
Date: 2006-02-06
Initial Package Version: 5.1
Origin: Upstream
Upstream Status: Applied 
Description: Contains Patch 001-002 from Upstream 

diff -Naur readline-5.1.orig/readline.c readline-5.1/readline.c
    old new  
    714714
    715715          rl_dispatching = 1;
    716716          RL_SETSTATE(RL_STATE_DISPATCHING);
    717           r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
     717          (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
    718718          RL_UNSETSTATE(RL_STATE_DISPATCHING);
    719719          rl_dispatching = 0;
    720720

  • readline-5.1 

    diff -Naur readline-5.1.orig/terminal.c readline-5.1/terminal.c
    old new  
    122122static char *_rl_visible_bell;
    123123
    124124/* Non-zero means the terminal can auto-wrap lines. */
    125 int _rl_term_autowrap;
     125int _rl_term_autowrap = -1;
    126126
    127127/* Non-zero means that this terminal has a meta key. */
    128128static int term_has_meta;
    … …  
    274274_rl_set_screen_size (rows, cols)
    275275     int rows, cols;
    276276{
     277  if (_rl_term_autowrap == -1)
     278    _rl_init_terminal_io (rl_terminal_name);
     279
    277280  if (rows > 0)
    278281    _rl_screenheight = rows;
    279282  if (cols > 0)

  • readline-5.1 

    diff -Naur readline-5.1.orig/text.c readline-5.1/text.c
    old new  
    10711071rl_delete (count, key)
    10721072     int count, key;
    10731073{
    1074   int r;
    1075 
    10761074  if (count < 0)
    10771075    return (_rl_rubout_char (-count, key));
    10781076
    … …  
    10901088      else
    10911089        rl_forward_byte (count, key);
    10921090
    1093       r = rl_kill_text (orig_point, rl_point);
     1091      rl_kill_text (orig_point, rl_point);
    10941092      rl_point = orig_point;
    1095       return r;
    10961093    }
    10971094  else
    10981095    {
    10991096      int new_point;
    11001097
    11011098      new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
    1102       return (rl_delete_text (rl_point, new_point));
     1099      rl_delete_text (rl_point, new_point);
    11031100    }
     1101  return 0;
    11041102}
    11051103
    11061104/* Delete the character under the cursor, unless the insertion
Note: See TracBrowser for help on using the repository browser.