thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.400

Browse Source 
Problem:    Compiler warnings for shadowed variables.
Solution:   Remove or rename the variables.
This commit is contained in:
Bram Moolenaar
2012-01-10 22:26:17 +01:00
parent 1f5965b3c4
commit 70b2a56d5a
19 changed files with 167 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/digraph.c
View File

@@ -2080,13 +2080,13 @@ get_digraph(cmdline)
/*
* Lookup the pair "char1", "char2" in the digraph tables.
* If no match, return "char2".
* If "meta" is TRUE and "char1" is a space, return "char2" | 0x80.
* If "meta_char" is TRUE and "char1" is a space, return "char2" | 0x80.
*/
static int
getexactdigraph(char1, char2, meta)
getexactdigraph(char1, char2, meta_char)
int char1;
int char2;
int meta;
int meta_char;
{
int i;
int retval = 0;
@@ -2159,7 +2159,7 @@ getexactdigraph(char1, char2, meta)
if (retval == 0) /* digraph deleted or not found */
{
if (char1 == ' ' && meta) /* <space> <char> --> meta-char */
if (char1 == ' ' && meta_char) /* <space> <char> --> meta-char */
return (char2 | 0x80);
return char2;
}
@@ -2171,16 +2171,16 @@ getexactdigraph(char1, char2, meta)
* Allow for both char1-char2 and char2-char1
*/
int
getdigraph(char1, char2, meta)
getdigraph(char1, char2, meta_char)
int char1;
int char2;
int meta;
int meta_char;
{
int retval;
if (((retval = getexactdigraph(char1, char2, meta)) == char2)
if (((retval = getexactdigraph(char1, char2, meta_char)) == char2)
&& (char1 != char2)
&& ((retval = getexactdigraph(char2, char1, meta)) == char1))
&& ((retval = getexactdigraph(char2, char1, meta_char)) == char1))
return char2;
return retval;
}