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/frame.c | |
| 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/frame.c')
| -rw-r--r-- | src/frame.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/frame.c b/src/frame.c index ea682835a87..9dabae55abc 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -20,10 +20,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 20 | #include <config.h> | 20 | #include <config.h> |
| 21 | 21 | ||
| 22 | #include <stdio.h> | 22 | #include <stdio.h> |
| 23 | #include <ctype.h> | ||
| 24 | #include <errno.h> | 23 | #include <errno.h> |
| 25 | #include <limits.h> | 24 | #include <limits.h> |
| 26 | #include <setjmp.h> | 25 | #include <setjmp.h> |
| 26 | |||
| 27 | #include <c-ctype.h> | ||
| 28 | |||
| 27 | #include "lisp.h" | 29 | #include "lisp.h" |
| 28 | #include "character.h" | 30 | #include "character.h" |
| 29 | #ifdef HAVE_X_WINDOWS | 31 | #ifdef HAVE_X_WINDOWS |
| @@ -3271,7 +3273,7 @@ x_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu | |||
| 3271 | new_value = Qnil; | 3273 | new_value = Qnil; |
| 3272 | while (*p0) | 3274 | while (*p0) |
| 3273 | { | 3275 | { |
| 3274 | while (*p1 && ! isspace (*p1) && *p1 != ',') p1++; | 3276 | while (*p1 && ! c_isspace (*p1) && *p1 != ',') p1++; |
| 3275 | if (p0 < p1) | 3277 | if (p0 < p1) |
| 3276 | new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil), | 3278 | new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil), |
| 3277 | new_value); | 3279 | new_value); |
| @@ -3279,7 +3281,7 @@ x_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu | |||
| 3279 | { | 3281 | { |
| 3280 | int c; | 3282 | int c; |
| 3281 | 3283 | ||
| 3282 | while ((c = *++p1) && isspace (c)); | 3284 | while ((c = *++p1) && c_isspace (c)); |
| 3283 | } | 3285 | } |
| 3284 | p0 = p1; | 3286 | p0 = p1; |
| 3285 | } | 3287 | } |