diff options
| author | msvensson@neptunus.(none) <> | 2007-02-06 15:46:17 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2007-02-06 15:46:17 +0100 |
| commit | e4001b3b5ab84a0e1522880d8052aa9c32ac92cc (patch) | |
| tree | fc2a41854c7dea15d518e7c0aeaed54f30988795 /cmd-line-utils/readline/histexpand.c | |
| parent | 72fbdf293324a50404801e787eb7bf94870e83c5 (diff) | |
| parent | 4a6770e06eddaf8595da3d414764c90502382f88 (diff) | |
| download | mariadb-git-e4001b3b5ab84a0e1522880d8052aa9c32ac92cc.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'cmd-line-utils/readline/histexpand.c')
| -rw-r--r-- | cmd-line-utils/readline/histexpand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-line-utils/readline/histexpand.c b/cmd-line-utils/readline/histexpand.c index a09be00a859..0a45438990a 100644 --- a/cmd-line-utils/readline/histexpand.c +++ b/cmd-line-utils/readline/histexpand.c @@ -560,12 +560,12 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) #if defined (HANDLE_MULTIBYTE) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) { - int c, l; + int chr, l; l = _rl_find_prev_mbchar (string, i, MB_FIND_ANY); - c = string[l]; + chr = string[l]; /* XXX - original patch had i - 1 ??? If i == 0 it would fail. */ - if (i && (c == '\'' || c == '"')) - quoted_search_delimiter = c; + if (i && (chr == '\'' || chr == '"')) + quoted_search_delimiter = chr; } else #endif /* HANDLE_MULTIBYTE */ |