Update of /cvsroot/winbash/winbash/lib/readline
In directory usw-pr-cvs1:/tmp/cvs-serv23905/lib/readline
Modified Files:
complete.c display.c readline.c vi_mode.c
Log Message:
Applied GNU bash 1.14.5 diffs
Index: complete.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/readline/complete.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- complete.c 9 Mar 2002 16:05:43 -0000 1.2
+++ complete.c 11 Mar 2002 01:47:04 -0000 1.3
@@ -491,7 +491,7 @@
}
}
- if (rl_point == end)
+ if (rl_point == end && found_quote == 0)
{
int quoted = 0;
/* We didn't find an unclosed quoted substring upon which to do
@@ -691,7 +691,7 @@
not be checked, add !matches[1] to the if clause. */
should_quote = rl_strpbrk (matches[0], rl_completer_word_break_characters) != 0;
#if defined (SHELL)
- should_quote = should_quote || rl_strpbrk (matches[0], "#$`?*[") != 0;
+ should_quote = should_quote || rl_strpbrk (matches[0], "#$`?*[!") != 0;
#endif
if (should_quote)
Index: display.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/readline/display.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- display.c 9 Mar 2002 16:05:43 -0000 1.2
+++ display.c 11 Mar 2002 01:47:05 -0000 1.3
@@ -185,7 +185,7 @@
return r;
}
- l = strlen (pmt);
+ l = pmt ? strlen (pmt) : 0;
r = ret = xmalloc (l + 1);
for (rl = ignoring = 0, p = pmt; p && *p; p++)
@@ -754,7 +754,7 @@
escape sequences (like drawing the `unbold' sequence without a
corresponding `bold') that manifests itself on certain terminals. */
- lendiff = strlen (local_prompt);
+ lendiff = local_prompt ? strlen (local_prompt) : 0;
if (current_line == 0 && !_rl_horizontal_scroll_mode &&
lendiff > visible_length &&
_rl_last_c_pos > 0 && (ofd - old) >= lendiff && term_cr)
Index: readline.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/readline/readline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- readline.c 9 Mar 2002 16:05:43 -0000 1.2
+++ readline.c 11 Mar 2002 01:47:05 -0000 1.3
@@ -994,7 +994,8 @@
/* Check for LC_CTYPE and use its value to decide the defaults for
8-bit character input and output. */
t = getenv ("LC_CTYPE");
- if (t && (strcmp (t, "iso-8859-1") == 0 || strcmp (t, "iso_8859_1") == 0))
+ if (t && (strcmp (t, "iso-8859-1") == 0 || strcmp (t, "iso_8859_1") == 0 ||
+ strcmp (t, "ISO-8859-1") == 0))
{
_rl_meta_flag = 1;
_rl_convert_meta_chars_to_ascii = 0;
@@ -3165,7 +3166,7 @@
return (rl_backward_kill_line (1));
else
{
- rl_end_of_line ();
+ rl_end_of_line (1, ignore);
if (orig_point != rl_point)
rl_kill_text (orig_point, rl_point);
rl_point = orig_point;
@@ -3188,7 +3189,7 @@
ding ();
else
{
- rl_beg_of_line ();
+ rl_beg_of_line (1, ignore);
rl_kill_text (orig_point, rl_point);
}
}
@@ -3212,7 +3213,7 @@
{
if (!rl_kill_ring)
{
- rl_abort ();
+ rl_abort (count, ignore);
return -1;
}
@@ -3233,7 +3234,7 @@
if (((rl_last_func != rl_yank_pop) && (rl_last_func != rl_yank)) ||
!rl_kill_ring)
{
- rl_abort ();
+ rl_abort (1, key);
return -1;
}
@@ -3252,7 +3253,7 @@
}
else
{
- rl_abort ();
+ rl_abort (1, key);
return -1;
}
}
Index: vi_mode.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/readline/vi_mode.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vi_mode.c 9 Mar 2002 03:39:13 -0000 1.1.1.1
+++ vi_mode.c 11 Mar 2002 01:47:05 -0000 1.2
@@ -275,7 +275,7 @@
if (key == '*' || key == '\\')
{
_rl_vi_set_last (key, 1, rl_arg_sign);
- rl_vi_insertion_mode ();
+ rl_vi_insertion_mode (1, key);
}
return (0);
}
@@ -286,7 +286,7 @@
{
rl_tilde_expand (0, key);
_rl_vi_set_last (key, 1, rl_arg_sign); /* XXX */
- rl_vi_insertion_mode ();
+ rl_vi_insertion_mode (1, key);
return (0);
}
@@ -507,8 +507,8 @@
rl_vi_insert_beg (count, key)
int count, key;
{
- rl_beg_of_line ();
- rl_vi_insertion_mode ();
+ rl_beg_of_line (1, key);
+ rl_vi_insertion_mode (1, key);
return (0);
}
@@ -517,15 +517,15 @@
{
if (rl_point < rl_end)
rl_point++;
- rl_vi_insertion_mode ();
+ rl_vi_insertion_mode (1, key);
return (0);
}
rl_vi_append_eol (count, key)
int count, key;
{
- rl_end_of_line ();
- rl_vi_append_mode ();
+ rl_end_of_line (1, key);
+ rl_vi_append_mode (1, key);
return (0);
}
@@ -836,7 +836,7 @@
rl_begin_undo_group ();
_rl_vi_doing_insert = 1;
_rl_vi_set_last (key, count, rl_arg_sign);
- rl_vi_insertion_mode ();
+ rl_vi_insertion_mode (1, key);
return (0);
}
@@ -1157,7 +1157,7 @@
rl_begin_undo_group ();
_rl_vi_doing_insert = 1;
- rl_vi_insertion_mode ();
+ rl_vi_insertion_mode (1, key);
return (0);
}
|
