Commit f6095868 authored by Paul Eggert's avatar Paul Eggert
Browse files

* charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid

shadowing.
* charset.c (map_charset_for_dump, Fchar_charset): Likewise.
parent d6550a9f
2011-03-08 Paul Eggert <eggert@cs.ucla.edu>
2011-03-08 Paul Eggert <eggert@cs.ucla.edu> 2011-03-08 Paul Eggert <eggert@cs.ucla.edu>
   
* xmenu.c (menu_highlight_callback): Now static. * xmenu.c (menu_highlight_callback): Now static.
...@@ -30,6 +28,10 @@ ...@@ -30,6 +28,10 @@
* window.h (check_all_windows): New decl, to forestall * window.h (check_all_windows): New decl, to forestall
gcc -Wmissing-prototypes diagnostic. gcc -Wmissing-prototypes diagnostic.
   
* charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid
shadowing.
* charset.c (map_charset_for_dump, Fchar_charset): Likewise.
2011-03-06 Chong Yidong <cyd@stupidchicken.com> 2011-03-06 Chong Yidong <cyd@stupidchicken.com>
   
* xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
...@@ -668,9 +668,9 @@ map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object ...@@ -668,9 +668,9 @@ map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object
while (1) while (1)
{ {
int index = GET_TEMP_CHARSET_WORK_ENCODER (c); int idx = GET_TEMP_CHARSET_WORK_ENCODER (c);
if (index >= from_idx && index <= to_idx) if (idx >= from_idx && idx <= to_idx)
{ {
if (NILP (XCAR (range))) if (NILP (XCAR (range)))
XSETCAR (range, make_number (c)); XSETCAR (range, make_number (c));
...@@ -2066,10 +2066,10 @@ that case, find the charset from what supported by that coding system. */) ...@@ -2066,10 +2066,10 @@ that case, find the charset from what supported by that coding system. */)
for (; CONSP (restriction); restriction = XCDR (restriction)) for (; CONSP (restriction); restriction = XCDR (restriction))
{ {
struct charset *charset; struct charset *rcharset;
CHECK_CHARSET_GET_CHARSET (XCAR (restriction), charset); CHECK_CHARSET_GET_CHARSET (XCAR (restriction), rcharset);
if (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset)) if (ENCODE_CHAR (rcharset, c) != CHARSET_INVALID_CODE (rcharset))
return XCAR (restriction); return XCAR (restriction);
} }
return Qnil; return Qnil;
......
...@@ -358,9 +358,9 @@ extern int emacs_mule_charset[256]; ...@@ -358,9 +358,9 @@ extern int emacs_mule_charset[256];
#define CHECK_CHARSET_GET_CHARSET(x, charset) \ #define CHECK_CHARSET_GET_CHARSET(x, charset) \
do { \ do { \
int id; \ int csid; \
CHECK_CHARSET_GET_ID (x, id); \ CHECK_CHARSET_GET_ID (x, csid); \
charset = CHARSET_FROM_ID (id); \ charset = CHARSET_FROM_ID (csid); \
} while (0) } while (0)
...@@ -541,4 +541,3 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object), ...@@ -541,4 +541,3 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object),
struct charset *, unsigned, unsigned); struct charset *, unsigned, unsigned);
#endif /* EMACS_CHARSET_H */ #endif /* EMACS_CHARSET_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment