mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-05 13:31:45 -08:00
Code Issues Projects Releases Wiki Activity

* character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing.

Browse source
This commit is contained in:
Paul Eggert 2011-03-16 01:31:20 -07:00
parent ea838e10ea
commit 170a2692ec
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
2011-03-16 Paul Eggert <eggert@cs.ucla.edu>
* character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing.
* font.c (font_unparse_xlfd): Don't mix pointers to variables with
pointers to constants.
(font_parse_fcname): Remove unused vars.

6
src/character.h
View file

@ -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 \
{ \