readline-5.1-cleanups.patch

   1 --- readline-5.1.orig/bind.c    2005-10-14 11:04:27.000000000 -0400
   2 +++ readline-5.1/bind.c 2005-12-12 15:49:19.000000000 -0500
   3 @@ -1506,8 +1506,6 @@ rl_variable_value (name)
   4       const char *name;
   5  {
   6    register int i;
   7 -  int  v;
   8 -  char *ret;
   9
  10    /* Check for simple variables first. */
  11    i = find_boolean_var (name);
  12 @@ -2170,7 +2168,6 @@ _rl_get_string_variable_value (name)
  13  {
  14    static char numbuf[32];
  15    char *ret;
  16 -  int n;
  17
  18    if (_rl_stricmp (name, "bell-style") == 0)
  19      {
  20 --- readline-5.1.orig/callback.c        2005-05-24 14:19:04.000000000 -0400
  21 +++ readline-5.1/callback.c     2005-12-12 19:32:00.000000000 -0500
  22 @@ -43,6 +43,7 @@
  23  #include "rldefs.h"
  24  #include "readline.h"
  25  #include "rlprivate.h"
  26 +#include "xmalloc.h"
  27
  28  /* Private data for callback registration functions.  See comments in
  29     rl_callback_read_char for more details. */
  30 --- readline-5.1.orig/display.c 2005-11-30 14:05:02.000000000 -0500
  31 +++ readline-5.1/display.c      2005-12-12 16:00:32.000000000 -0500
  32 @@ -1164,7 +1166,7 @@ update_line (old, new, current_line, oma
  33    int col_lendiff, col_temp;
  34  #if defined (HANDLE_MULTIBYTE)
  35    mbstate_t ps_new, ps_old;
  36 -  int new_offset, old_offset, tmp;
  37 +  int new_offset, old_offset;
  38  #endif
  39
  40    /* If we're at the right edge of a terminal that supports xn, we're
  41 --- readline-5.1.orig/isearch.c 2005-10-07 18:21:32.000000000 -0400
  42 +++ readline-5.1/isearch.c      2005-12-12 15:55:37.000000000 -0500
  43 @@ -67,10 +67,6 @@ static _rl_search_cxt *_rl_isearch_init
  44  static void _rl_isearch_fini PARAMS((_rl_search_cxt *));
  45  static int _rl_isearch_cleanup PARAMS((_rl_search_cxt *, int));
  46
  47 -/* Last line found by the current incremental search, so we don't `find'
  48 -   identical lines many times in a row. */
  49 -static char *prev_line_found;
  50 -
  51  /* Last search string and its length. */
  52  static char *last_isearch_string;
  53  static int last_isearch_string_len;
  54 --- readline-5.1.orig/misc.c    2005-05-15 15:27:09.000000000 -0400
  55 +++ readline-5.1/misc.c 2005-12-12 16:09:28.000000000 -0500
  56 @@ -212,6 +212,8 @@ rl_digit_loop ()
  57        if (r <= 0 || (RL_ISSTATE (RL_STATE_NUMERICARG) == 0))
  58          break;
  59      }
  60 +
  61 +  return 0;
  62  }
  63
  64  /* Create a default argument. */
  65 --- readline-5.1.orig/readline.c        2005-07-04 22:29:35.000000000 -0400
  66 +++ readline-5.1/readline.c     2005-12-12 15:47:58.000000000 -0500
  67 @@ -85,7 +85,7 @@ static void bind_arrow_keys_internal PAR
  68  static void bind_arrow_keys PARAMS((void));
  69
  70  static void readline_default_bindings PARAMS((void));
  71 -static void reset_default_bindings PARAMS((void));
  72 +/* static void reset_default_bindings PARAMS((void)); */
  73
  74  static int _rl_subseq_result PARAMS((int, Keymap, int, int));
  75  static int _rl_subseq_getchar PARAMS((int));
  76 @@ -1054,6 +1054,7 @@ readline_default_bindings ()
  77
  78  /* Reset the default bindings for the terminal special characters we're
  79     interested in back to rl_insert and read the new ones. */
  80 +/* Unused function
  81  static void
  82  reset_default_bindings ()
  83  {
  84 @@ -1063,6 +1064,7 @@ reset_default_bindings ()
  85        rl_tty_set_default_bindings (_rl_keymap);
  86      }
  87  }
  88 +*/
  89
  90  /* Bind some common arrow key sequences in MAP. */
  91  static void
  92 --- readline-5.1.orig/rltty.c   2005-11-13 21:07:55.000000000 -0500
  93 +++ readline-5.1/rltty.c        2005-12-12 15:48:41.000000000 -0500
  94 @@ -933,7 +933,6 @@ rltty_set_default_bindings (kmap)
  95  #if !defined (NO_TTY_DRIVER)
  96    TIOTYPE ttybuff;
  97    int tty;
  98 -  static int called = 0;
  99
 100    tty = fileno (rl_instream);
 101
 102 --- readline-5.1.orig/search.c  2005-08-27 11:52:36.000000000 -0400
 103 +++ readline-5.1/search.c       2005-12-12 15:48:21.000000000 -0500
 104 @@ -70,7 +70,6 @@ static int rl_history_search_pos;
 105  static char *history_search_string;
 106  static int history_string_size;
 107
 108 -static UNDO_LIST *noninc_saved_undo_list;
 109  static void make_history_line_current PARAMS((HIST_ENTRY *));
 110  static int noninc_search_from_pos PARAMS((char *, int, int));
 111  static int noninc_dosearch PARAMS((char *, int));
 112 --- readline-5.1.orig/text.c    2005-09-24 19:06:07.000000000 -0400
 113 +++ readline-5.1/text.c 2005-12-12 15:50:29.000000000 -0500
 114 @@ -1239,7 +1239,7 @@ rl_change_case (count, op)
 115  #if defined (HANDLE_MULTIBYTE)
 116    wchar_t wc, nwc;
 117    char mb[MB_LEN_MAX+1];
 118 -  int mblen, p;
 119 +  int mblen;
 120    mbstate_t ps;
 121  #endif
 122
 123 --- readline-5.1.orig/vi_mode.c 2005-11-01 11:11:04.000000000 -0500
 124 +++ readline-5.1/vi_mode.c      2005-12-12 15:48:15.000000000 -0500
 125 @@ -1111,7 +1111,7 @@ int
 126  rl_vi_rubout (count, key)
 127       int count, key;
 128  {
 129 -  int p, opoint;
 130 +  int opoint;
 131
 132    if (count < 0)
 133      return (rl_vi_delete (-count, key));