diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-16 01:31:20 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-16 01:31:20 -0700 |
| commit | 170a2692ec2abdc4e4978206ddec6bebb6c989b2 (patch) | |
| tree | 2d1a9b0a9673d0b472b68cb66d5bf145fcb9e605 /src/character.h | |
| parent | ea838e10ea8a3e390b2d9160e02c4a5e08714850 (diff) | |
| download | emacs-170a2692ec2abdc4e4978206ddec6bebb6c989b2.tar.gz | |
* character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/character.h b/src/character.h index f0b0002032e..77c670728d0 100644 --- a/src/character.h +++ b/src/character.h @@ -417,10 +417,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ if (!NILP (BVAR (current_buffer, enable_multibyte_characters))) \ { \ unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX); \ - int len; \ + int string_len; \ \ - OUTPUT= STRING_CHAR_AND_LENGTH (ptr, len); \ - BYTEIDX += len; \ + OUTPUT= STRING_CHAR_AND_LENGTH (ptr, string_len); \ + BYTEIDX += string_len; \ } \ else \ { \ |