Mercurial > emacs
diff src/charset.c @ 112434:9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 22 Jan 2011 18:56:06 -0800 |
parents | 42e22c4f06b7 |
children |
line wrap: on
line diff
--- a/src/charset.c Sat Jan 22 17:09:09 2011 -0800 +++ b/src/charset.c Sat Jan 22 18:56:06 2011 -0800 @@ -666,7 +666,7 @@ c = temp_charset_work->min_char; stop = (temp_charset_work->max_char < 0x20000 ? temp_charset_work->max_char : 0xFFFF); - + while (1) { int index = GET_TEMP_CHARSET_WORK_ENCODER (c); @@ -1828,7 +1828,7 @@ else { code = GET_TEMP_CHARSET_WORK_ENCODER (c); - code = INDEX_TO_CODE_POINT (charset, code); + code = INDEX_TO_CODE_POINT (charset, code); } } else /* method == CHARSET_METHOD_OFFSET */ @@ -2295,7 +2295,7 @@ { Lisp_Object tempdir; tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); - if (access ((char *) SDATA (tempdir), 0) < 0) + if (access (SSDATA (tempdir), 0) < 0) { dir_warning ("Error: charsets directory (%s) does not exist.\n\ Emacs will not function correctly without the character map files.\n\ @@ -2431,4 +2431,3 @@ } #endif /* emacs */ -