diff options
| author | Paul Eggert | 2012-08-16 14:58:44 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-08-16 14:58:44 -0700 |
| commit | 620f13b0612810324592ab2d2b4e5a5dab27f981 (patch) | |
| tree | 844d21f0c90ede1887eb699058398f5f9a81f069 /src/nsimage.m | |
| parent | 85c2386bbe5d7957cf5750b6f96b2868f83eedf4 (diff) | |
| download | emacs-620f13b0612810324592ab2d2b4e5a5dab27f981.tar.gz emacs-620f13b0612810324592ab2d2b4e5a5dab27f981.zip | |
Use ASCII tests for character types.
* admin/merge-gnulib (GNULIB_MODULES): Add c-ctype.
* lwlib/lwlib-Xaw.c, lwlib/lwlib.c, lwlib/xlwmenu.c:
Don't include <ctype.h>; no longer needed.
* lwlib/lwlib-Xaw.c (openFont):
* lwlib/xlwmenu.c (openXftFont): Test just for ASCII digits.
* src/category.c, src/dispnew.c, src/doprnt.c, src/editfns.c, src/syntax.c
* src/term.c, src/xfns.c, src/xterm.c:
Don't include <ctype.h>; was not needed.
* src/charset.c, src/doc.c, src/fileio.c, src/font.c, src/frame.c:
* src/gtkutil.c, src/image.c, src/sysdep.c, src/xfaces.c:
Include <c-ctype.h> instead of <ctype.h>.
* src/nsterm.m: Include <c-ctype.h>.
* src/charset.c (read_hex):
* src/doc.c (Fsnarf_documentation):
* src/fileio.c (IS_DRIVE) [WINDOWSNT]:
(DRIVE_LETTER) [DOS_NT]:
(Ffile_name_directory, Fexpand_file_name)
(Fsubstitute_in_file_name):
* src/font.c (font_parse_xlfd, font_parse_fcname):
* src/frame.c (x_set_font_backend):
* src/gtkutil.c (xg_get_font):
* src/image.c (xbm_scan, xpm_scan, pbm_scan_number):
* src/nsimage.m (hexchar):
* src/nsterm.m (ns_xlfd_to_fontname):
* src/sysdep.c (system_process_attributes):
* src/xfaces.c (hash_string_case_insensitive):
Use C-locale tests instead of locale-specific tests for character
types, since we want the ASCII interpretation here, not the
interpretation suitable for whatever happens to be the current locale.
Diffstat (limited to 'src/nsimage.m')
| -rw-r--r-- | src/nsimage.m | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nsimage.m b/src/nsimage.m index 1479294948b..8a8a3ddaae4 100644 --- a/src/nsimage.m +++ b/src/nsimage.m | |||
| @@ -302,7 +302,7 @@ static EmacsImage *ImageList = nil; | |||
| 302 | [bmRep release]; | 302 | [bmRep release]; |
| 303 | return nil; | 303 | return nil; |
| 304 | } | 304 | } |
| 305 | #define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10) | 305 | #define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10) |
| 306 | s1 = *s++; | 306 | s1 = *s++; |
| 307 | s2 = *s++; | 307 | s2 = *s++; |
| 308 | c = hexchar (s1) * 0x10 + hexchar (s2); | 308 | c = hexchar (s1) * 0x10 + hexchar (s2); |
| @@ -501,4 +501,3 @@ static EmacsImage *ImageList = nil; | |||
| 501 | } | 501 | } |
| 502 | 502 | ||
| 503 | @end | 503 | @end |
| 504 | |||