summaryrefslogtreecommitdiff
path: root/src/digraph.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-01-10 22:26:17 +0100
committerBram Moolenaar <Bram@vim.org>2012-01-10 22:26:17 +0100
commit70b2a56d5a8fd54f3d0707fa77dea86a4bd8195f (patch)
tree2144b21b49d79de16665fb585daf1e9cf66e85c0 /src/digraph.c
parent1f5965b3c4d2b29e167a5dfecdf0ec59fe4c45c0 (diff)
downloadvim-git-70b2a56d5a8fd54f3d0707fa77dea86a4bd8195f.tar.gz
updated for version 7.3.400v7.3.400
Problem: Compiler warnings for shadowed variables. Solution: Remove or rename the variables.
Diffstat (limited to 'src/digraph.c')
-rw-r--r--src/digraph.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/digraph.c b/src/digraph.c
index ed22b347a..fc29ac749 100644
--- a/src/digraph.c
+++ b/src/digraph.c
@@ -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;
}