From 620f13b0612810324592ab2d2b4e5a5dab27f981 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 16 Aug 2012 14:58:44 -0700 Subject: 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 ; 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 ; 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 instead of . * src/nsterm.m: Include . * 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. --- lwlib/xlwmenu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lwlib/xlwmenu.c') diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index e8831c37f8f..c76cb1a3f38 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA. */ #include #include -#include #include #if (defined __sun) && !(defined SUNOS41) @@ -1858,7 +1857,7 @@ openXftFont (XlwMenuWidget mw) int screen = XScreenNumberOfScreen (mw->core.screen); int len = strlen (fname), i = len-1; /* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9. */ - while (i > 0 && isdigit (fname[i])) + while (i > 0 && '0' <= fname[i] && fname[i] <= '9') --i; if (fname[i] == ' ') { -- cgit v1.2.1