diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-06-05 15:30:57 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-06-05 15:30:57 +0300 |
| commit | 5fc05b9528a63768831171de669352f4e52342f1 (patch) | |
| tree | a617aeeb8a573f036ab34bd719614ff170116bf0 /cmd-line-utils | |
| parent | 51dd28a9a93f69be4b2c06d205d5d82db05b4cc8 (diff) | |
| parent | 22454390c0ce1c3f90059811548a71ee18cac4f3 (diff) | |
| download | mariadb-git-5fc05b9528a63768831171de669352f4e52342f1.tar.gz | |
automerge
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/readline/bind.c | 4 | ||||
| -rw-r--r-- | cmd-line-utils/readline/display.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index baed1dfad49..9d0a803cc6c 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -699,8 +699,10 @@ rl_function_of_keyseq (keyseq, map, type) for (i = 0; keyseq && keyseq[i]; i++) { - unsigned char ic = keyseq[i]; + unsigned char uc = keyseq[i]; + int ic; + ic= uc; if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii) { if (map[ESC].type == ISKMAP) diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c index 6f63faa9738..54c56954f43 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_CHAR (c)) return ((_rl_output_meta_chars == 0) ? 4 : 1); if (uc == '\t') |