diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-06 13:07:35 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-06 13:07:35 +0200 |
| commit | 3738f7857f56d6728db328b11d956d9eb28933a5 (patch) | |
| tree | a296754126b086c60a003f8b88c4800d1e9fcf07 /cmd-line-utils | |
| parent | 56ae4a7f609fc38b8fd589b1d5b1a95455298c3f (diff) | |
| parent | 12f91b1d8c45bb84ee5bc7ee4b0b455fbb0e2a90 (diff) | |
| download | mariadb-git-3738f7857f56d6728db328b11d956d9eb28933a5.tar.gz | |
auto-merge
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/readline/bind.c | 2 | ||||
| -rw-r--r-- | cmd-line-utils/readline/chardefs.h | 3 | ||||
| -rw-r--r-- | cmd-line-utils/readline/display.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index baed1dfad49..fc7bebfd813 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -701,7 +701,7 @@ rl_function_of_keyseq (keyseq, map, type) { unsigned char ic = keyseq[i]; - 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) { diff --git a/cmd-line-utils/readline/chardefs.h b/cmd-line-utils/readline/chardefs.h index def3a111bd3..36fe7fdd7ac 100644 --- a/cmd-line-utils/readline/chardefs.h +++ b/cmd-line-utils/readline/chardefs.h @@ -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) diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c index 6f63faa9738..842a586b76b 100644 --- a/cmd-line-utils/readline/display.c +++ b/cmd-line-utils/readline/display.c @@ -1888,7 +1888,7 @@ rl_character_len (c, pos) uc = (unsigned char)c; - if (META_CHAR (uc)) + if (META_BYTE (uc)) return ((_rl_output_meta_chars == 0) ? 4 : 1); if (uc == '\t') |