mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

merged 5.0-bugteam -> 5.1-bugteam

Browse source
This commit is contained in:
Georgi Kodinov 2009-06-05 19:40:36 +03:00
commit 9ceb37269d
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd-line-utils/readline/bind.c
View file

@ -699,11 +699,9 @@ rl_function_of_keyseq (keyseq, map, type)
for (i = 0; keyseq && keyseq[i]; i++)
{
unsigned char uc = keyseq[i];
int ic;
unsigned char ic = keyseq[i];
ic= uc;
if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
if (META_BYTE (ic) && _rl_convert_meta_chars_to_ascii)
{
if (map[ESC].type == ISKMAP)
{

3
cmd-line-utils/readline/chardefs.h
View file

@ -59,7 +59,8 @@
#define largest_char 255 /* Largest character value. */
#define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0))
#define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char)
#define META_BYTE(c) ((c) > meta_character_threshold)
#define META_CHAR(c) (META_BYTE(c) && (c) <= largest_char)
#define CTRL(c) ((c) & control_character_mask)
#define META(c) ((c) | meta_character_bit)

2
cmd-line-utils/readline/display.c
View file

@ -1888,7 +1888,7 @@ rl_character_len (c, pos)
uc = (unsigned char)c;
if (META_CHAR (c))
if (META_BYTE (uc))
return ((_rl_output_meta_chars == 0) ? 4 : 1);
if (uc == '\t')