[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109647: Use ASCII tests for characte
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109647: Use ASCII tests for character types. |
|
Date: |
Thu, 16 Aug 2012 14:58:44 -0700 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109647
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-16 14:58:44 -0700
message:
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.
modified:
admin/ChangeLog
admin/merge-gnulib
lwlib/ChangeLog
lwlib/lwlib-Xaw.c
lwlib/lwlib.c
lwlib/xlwmenu.c
src/ChangeLog
src/category.c
src/charset.c
src/dispnew.c
src/doc.c
src/doprnt.c
src/editfns.c
src/fileio.c
src/font.c
src/frame.c
src/gtkutil.c
src/image.c
src/nsimage.m
src/nsterm.m
src/syntax.c
src/sysdep.c
src/term.c
src/xfaces.c
src/xfns.c
src/xterm.c
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2012-08-14 17:45:25 +0000
+++ b/admin/ChangeLog 2012-08-16 21:58:44 +0000
@@ -1,3 +1,10 @@
+2012-08-16 Paul Eggert <address@hidden>
+
+ Use ASCII tests for character types.
+ * merge-gnulib (GNULIB_MODULES): Add c-ctype. This documents a
+ new direct dependency; c-ctype was already being used indirectly
+ via other gnulib modules.
+
2012-08-14 Paul Eggert <address@hidden>
Use bool for Emacs Lisp booleans.
=== modified file 'admin/merge-gnulib'
--- a/admin/merge-gnulib 2012-08-14 17:45:25 +0000
+++ b/admin/merge-gnulib 2012-08-16 21:58:44 +0000
@@ -26,7 +26,7 @@
GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
GNULIB_MODULES='
- alloca-opt c-strcase
+ alloca-opt c-ctype c-strcase
careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
dtoastr dtotimespec dup2 environ
filemode getloadavg getopt-gnu gettime gettimeofday
=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog 2012-08-01 17:55:15 +0000
+++ b/lwlib/ChangeLog 2012-08-16 21:58:44 +0000
@@ -1,3 +1,11 @@
+2012-08-16 Paul Eggert <address@hidden>
+
+ Use ASCII tests for character types.
+ * lwlib-Xaw.c, lwlib.c, xlwmenu.c:
+ Don't include <ctype.h>; no longer needed.
+ * lwlib-Xaw.c (openFont):
+ * xlwmenu.c (openXftFont): Test just for ASCII digits.
+
2012-08-01 Glenn Morris <address@hidden>
* Makefile.in (config_h): Add conf_post.h.
=== modified file 'lwlib/lwlib-Xaw.c'
--- a/lwlib/lwlib-Xaw.c 2012-06-26 01:05:39 +0000
+++ b/lwlib/lwlib-Xaw.c 2012-08-16 21:58:44 +0000
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <setjmp.h>
-#include <ctype.h>
#include <lisp.h>
@@ -125,7 +124,7 @@
XftFont *fn;
/* 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] == ' ')
{
=== modified file 'lwlib/lwlib.c'
--- a/lwlib/lwlib.c 2012-07-06 21:07:46 +0000
+++ b/lwlib/lwlib.c 2012-08-16 21:58:44 +0000
@@ -28,7 +28,6 @@
#include <sys/types.h>
#include <stdio.h>
-#include <ctype.h>
#include "lwlib-int.h"
#include "lwlib-utils.h"
#include <X11/StringDefs.h>
=== modified file 'lwlib/xlwmenu.c'
--- a/lwlib/xlwmenu.c 2012-06-26 01:05:39 +0000
+++ b/lwlib/xlwmenu.c 2012-08-16 21:58:44 +0000
@@ -28,7 +28,6 @@
#include <lisp.h>
#include <stdio.h>
-#include <ctype.h>
#include <sys/types.h>
#if (defined __sun) && !(defined SUNOS41)
@@ -1858,7 +1857,7 @@
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] == ' ')
{
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-16 07:58:24 +0000
+++ b/src/ChangeLog 2012-08-16 21:58:44 +0000
@@ -1,3 +1,31 @@
+2012-08-16 Paul Eggert <address@hidden>
+
+ Use ASCII tests for character types.
+ * category.c, dispnew.c, doprnt.c, editfns.c, syntax.c, term.c:
+ * xfns.c, xterm.c:
+ Don't include <ctype.h>; was not needed.
+ * charset.c, doc.c, fileio.c, font.c, frame.c, gtkutil.c, image.c:
+ * sysdep.c, xfaces.c:
+ Include <c-ctype.h> instead of <ctype.h>.
+ * nsterm.m: Include <c-ctype.h>.
+ * charset.c (read_hex):
+ * doc.c (Fsnarf_documentation):
+ * fileio.c (IS_DRIVE) [WINDOWSNT]:
+ (DRIVE_LETTER) [DOS_NT]:
+ (Ffile_name_directory, Fexpand_file_name)
+ (Fsubstitute_in_file_name):
+ * font.c (font_parse_xlfd, font_parse_fcname):
+ * frame.c (x_set_font_backend):
+ * gtkutil.c (xg_get_font):
+ * image.c (xbm_scan, xpm_scan, pbm_scan_number):
+ * nsimage.m (hexchar):
+ * nsterm.m (ns_xlfd_to_fontname):
+ * sysdep.c (system_process_attributes):
+ * 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.
+
2012-08-16 Martin Rudalics <address@hidden>
Consistently check windows for validity/liveness
=== modified file 'src/category.c'
--- a/src/category.c 2012-08-16 03:13:44 +0000
+++ b/src/category.c 2012-08-16 21:58:44 +0000
@@ -32,7 +32,6 @@
#define CATEGORY_INLINE EXTERN_INLINE
-#include <ctype.h>
#include <setjmp.h>
#include "lisp.h"
#include "character.h"
=== modified file 'src/charset.c'
--- a/src/charset.c 2012-08-03 23:36:11 +0000
+++ b/src/charset.c 2012-08-16 21:58:44 +0000
@@ -30,10 +30,10 @@
#include <stdio.h>
#include <unistd.h>
-#include <ctype.h>
#include <limits.h>
#include <sys/types.h>
#include <setjmp.h>
+#include <c-ctype.h>
#include "lisp.h"
#include "character.h"
#include "charset.h"
@@ -446,7 +446,7 @@
return 0;
}
n = 0;
- while (isxdigit (c = getc (fp)))
+ while (c_isxdigit (c = getc (fp)))
{
if (UINT_MAX >> 4 < n)
*overflow = 1;
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-08-07 07:33:18 +0000
+++ b/src/dispnew.c 2012-08-16 21:58:44 +0000
@@ -23,7 +23,6 @@
#include <signal.h>
#include <stdio.h>
-#include <ctype.h>
#include <setjmp.h>
#include <unistd.h>
=== modified file 'src/doc.c'
--- a/src/doc.c 2012-08-07 13:37:21 +0000
+++ b/src/doc.c 2012-08-16 21:58:44 +0000
@@ -22,11 +22,12 @@
#include <sys/types.h>
#include <sys/file.h> /* Must be after sys/types.h for USG*/
-#include <ctype.h>
#include <setjmp.h>
#include <fcntl.h>
#include <unistd.h>
+#include <c-ctype.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
@@ -597,9 +598,9 @@
{
ptrdiff_t len;
- while (*beg && isspace (*beg)) ++beg;
+ while (*beg && c_isspace (*beg)) ++beg;
- for (end = beg; *end && ! isspace (*end); ++end)
+ for (end = beg; *end && ! c_isspace (*end); ++end)
if (*end == '/') beg = end+1; /* skip directory part */
len = end - beg;
=== modified file 'src/doprnt.c'
--- a/src/doprnt.c 2012-08-03 23:36:11 +0000
+++ b/src/doprnt.c 2012-08-16 21:58:44 +0000
@@ -102,7 +102,6 @@
#include <config.h>
#include <stdio.h>
-#include <ctype.h>
#include <setjmp.h>
#include <float.h>
#include <unistd.h>
=== modified file 'src/editfns.c'
--- a/src/editfns.c 2012-08-14 17:10:38 +0000
+++ b/src/editfns.c 2012-08-16 21:58:44 +0000
@@ -44,7 +44,6 @@
#include <sys/resource.h>
#endif
-#include <ctype.h>
#include <float.h>
#include <limits.h>
#include <intprops.h>
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2012-08-14 04:49:18 +0000
+++ b/src/fileio.c 2012-08-16 21:58:44 +0000
@@ -30,7 +30,6 @@
#include <pwd.h>
#endif
-#include <ctype.h>
#include <errno.h>
#ifdef HAVE_LIBSELINUX
@@ -38,6 +37,8 @@
#include <selinux/context.h>
#endif
+#include <c-ctype.h>
+
#include "lisp.h"
#include "intervals.h"
#include "character.h"
@@ -67,12 +68,12 @@
#define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z')
#endif
#ifdef WINDOWSNT
-#define IS_DRIVE(x) isalpha ((unsigned char) (x))
+#define IS_DRIVE(x) c_isalpha (x)
#endif
/* Need to lower-case the drive letter, or else expanded
filenames will sometimes compare unequal, because
`expand-file-name' doesn't always down-case the drive letter. */
-#define DRIVE_LETTER(x) (tolower ((unsigned char) (x)))
+#define DRIVE_LETTER(x) c_tolower (x)
#endif
#include "systime.h"
@@ -364,7 +365,7 @@
r += 2;
}
- if (getdefdir (toupper ((unsigned char) *beg) - 'A' + 1, r))
+ if (getdefdir (c_toupper (*beg) - 'A' + 1, r))
{
if (!IS_DIRECTORY_SEP (res[strlen (res) - 1]))
strcat (res, "/");
@@ -1053,7 +1054,7 @@
if (!IS_DIRECTORY_SEP (nm[0]))
{
adir = alloca (MAXPATHLEN + 1);
- if (!getdefdir (toupper (drive) - 'A' + 1, adir))
+ if (!getdefdir (c_toupper (drive) - 'A' + 1, adir))
adir = NULL;
}
if (!adir)
@@ -1129,7 +1130,7 @@
adir = alloca (MAXPATHLEN + 1);
if (drive)
{
- if (!getdefdir (toupper (drive) - 'A' + 1, adir))
+ if (!getdefdir (c_toupper (drive) - 'A' + 1, adir))
newdir = "/";
}
else
@@ -1635,7 +1636,7 @@
else
{
o = p;
- while (p != endp && (isalnum (*p) || *p == '_')) p++;
+ while (p != endp && (c_isalnum (*p) || *p == '_')) p++;
s = p;
}
@@ -1698,7 +1699,7 @@
else
{
o = p;
- while (p != endp && (isalnum (*p) || *p == '_')) p++;
+ while (p != endp && (c_isalnum (*p) || *p == '_')) p++;
s = p;
}
=== modified file 'src/font.c'
--- a/src/font.c 2012-08-15 14:20:16 +0000
+++ b/src/font.c 2012-08-16 21:58:44 +0000
@@ -23,9 +23,10 @@
#include <config.h>
#include <float.h>
#include <stdio.h>
-#include <ctype.h>
#include <setjmp.h>
+#include <c-ctype.h>
+
#include "lisp.h"
#include "character.h"
#include "buffer.h"
@@ -1079,7 +1080,7 @@
p = f[XLFD_POINT_INDEX];
if (*p == '[')
point_size = parse_matrix (p);
- else if (isdigit (*p))
+ else if (c_isdigit (*p))
point_size = atoi (p), point_size /= 10;
if (point_size >= 0)
ASET (font, FONT_SIZE_INDEX, make_float (point_size));
@@ -1346,7 +1347,7 @@
{
int decimal = 0, size_found = 1;
for (q = p + 1; *q && *q != ':'; q++)
- if (! isdigit (*q))
+ if (! c_isdigit (*q))
{
if (*q != '.' || decimal)
{
@@ -1474,7 +1475,7 @@
/* Scan backwards from the end, looking for a size. */
for (p = name + len - 1; p >= name; p--)
- if (!isdigit (*p))
+ if (!c_isdigit (*p))
break;
if ((p < name + len - 1) && ((p + 1 == name) || *p == ' '))
=== modified file 'src/frame.c'
--- a/src/frame.c 2012-08-14 08:44:24 +0000
+++ b/src/frame.c 2012-08-16 21:58:44 +0000
@@ -20,10 +20,12 @@
#include <config.h>
#include <stdio.h>
-#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <setjmp.h>
+
+#include <c-ctype.h>
+
#include "lisp.h"
#include "character.h"
#ifdef HAVE_X_WINDOWS
@@ -3271,7 +3273,7 @@
new_value = Qnil;
while (*p0)
{
- while (*p1 && ! isspace (*p1) && *p1 != ',') p1++;
+ while (*p1 && ! c_isspace (*p1) && *p1 != ',') p1++;
if (p0 < p1)
new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil),
new_value);
@@ -3279,7 +3281,7 @@
{
int c;
- while ((c = *++p1) && isspace (c));
+ while ((c = *++p1) && c_isspace (c));
}
p0 = p1;
}
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2012-08-16 06:57:48 +0000
+++ b/src/gtkutil.c 2012-08-16 21:58:44 +0000
@@ -24,7 +24,9 @@
#include <signal.h>
#include <stdio.h>
#include <setjmp.h>
-#include <ctype.h>
+
+#include <c-ctype.h>
+
#include "lisp.h"
#include "xterm.h"
#include "blockinput.h"
@@ -2072,7 +2074,7 @@
if (p)
{
char *ep = p+1;
- while (isdigit (*ep))
+ while (c_isdigit (*ep))
++ep;
if (*ep == '\0') *p = ' ';
}
=== modified file 'src/image.c'
--- a/src/image.c 2012-07-16 04:47:31 +0000
+++ b/src/image.c 2012-08-16 21:58:44 +0000
@@ -20,7 +20,6 @@
#include <config.h>
#include <stdio.h>
#include <math.h>
-#include <ctype.h>
#include <unistd.h>
#ifdef HAVE_PNG
@@ -33,6 +32,8 @@
#include <setjmp.h>
+#include <c-ctype.h>
+
/* This makes the fields of a Display accessible, in Xlib header files. */
#define XLIB_ILLEGAL_ACCESS
@@ -2405,12 +2406,12 @@
loop:
/* Skip white space. */
- while (*s < end && (c = *(*s)++, isspace (c)))
+ while (*s < end && (c = *(*s)++, c_isspace (c)))
;
if (*s >= end)
c = 0;
- else if (isdigit (c))
+ else if (c_isdigit (c))
{
int value = 0, digit;
@@ -2422,7 +2423,7 @@
while (*s < end)
{
c = *(*s)++;
- if (isdigit (c))
+ if (c_isdigit (c))
digit = c - '0';
else if (c >= 'a' && c <= 'f')
digit = c - 'a' + 10;
@@ -2433,11 +2434,11 @@
value = 16 * value + digit;
}
}
- else if (isdigit (c))
+ else if (c_isdigit (c))
{
value = c - '0';
while (*s < end
- && (c = *(*s)++, isdigit (c)))
+ && (c = *(*s)++, c_isdigit (c)))
value = 8 * value + c - '0';
}
}
@@ -2445,7 +2446,7 @@
{
value = c - '0';
while (*s < end
- && (c = *(*s)++, isdigit (c)))
+ && (c = *(*s)++, c_isdigit (c)))
value = 10 * value + c - '0';
}
@@ -2454,11 +2455,11 @@
*ival = value;
c = XBM_TK_NUMBER;
}
- else if (isalpha (c) || c == '_')
+ else if (c_isalpha (c) || c == '_')
{
*sval++ = c;
while (*s < end
- && (c = *(*s)++, (isalnum (c) || c == '_')))
+ && (c = *(*s)++, (c_isalnum (c) || c == '_')))
*sval++ = c;
*sval = 0;
if (*s < end)
@@ -3661,16 +3662,17 @@
while (*s < end)
{
/* Skip white-space. */
- while (*s < end && (c = *(*s)++, isspace (c)))
+ while (*s < end && (c = *(*s)++, c_isspace (c)))
;
/* gnus-pointer.xpm uses '-' in its identifier.
sb-dir-plus.xpm uses '+' in its identifier. */
- if (isalpha (c) || c == '_' || c == '-' || c == '+')
+ if (c_isalpha (c) || c == '_' || c == '-' || c == '+')
{
*beg = *s - 1;
while (*s < end
- && (c = **s, isalnum (c) || c == '_' || c == '-' || c == '+'))
+ && (c = **s, c_isalnum (c)
+ || c == '_' || c == '-' || c == '+'))
++*s;
*len = *s - *beg;
return XPM_TK_IDENT;
@@ -5014,7 +5016,7 @@
while (*s < end)
{
/* Skip white-space. */
- while (*s < end && (c = *(*s)++, isspace (c)))
+ while (*s < end && (c = *(*s)++, c_isspace (c)))
;
if (c == '#')
@@ -5023,11 +5025,11 @@
while (*s < end && (c = *(*s)++, c != '\n'))
;
}
- else if (isdigit (c))
+ else if (c_isdigit (c))
{
/* Read decimal number. */
val = c - '0';
- while (*s < end && (c = *(*s)++, isdigit (c)))
+ while (*s < end && (c = *(*s)++, c_isdigit (c)))
val = 10 * val + c - '0';
break;
}
@@ -8554,7 +8556,7 @@
don't either. Let the Lisp loader use `unwind-protect' instead. */
printnum1 = FRAME_X_WINDOW (f);
printnum2 = img->pixmap;
- window_and_pixmap_id
+ window_and_pixmap_id
= make_formatted_string (buffer, "%"pMu" %"pMu, printnum1, printnum2);
printnum1 = FRAME_FOREGROUND_PIXEL (f);
=== modified file 'src/nsimage.m'
--- a/src/nsimage.m 2012-07-13 18:03:10 +0000
+++ b/src/nsimage.m 2012-08-16 21:58:44 +0000
@@ -302,7 +302,7 @@
[bmRep release];
return nil;
}
-#define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
+#define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10)
s1 = *s++;
s2 = *s++;
c = hexchar (s1) * 0x10 + hexchar (s2);
@@ -501,4 +501,3 @@
}
@end
-
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2012-08-15 18:58:19 +0000
+++ b/src/nsterm.m 2012-08-16 21:58:44 +0000
@@ -36,6 +36,8 @@
#include <signal.h>
#include <unistd.h>
#include <setjmp.h>
+
+#include <c-ctype.h>
#include <c-strcase.h>
#include <ftoastr.h>
@@ -6785,20 +6787,20 @@
/* undo hack in ns_fontname_to_xlfd, converting '$' to '-', '_' to ' '
also uppercase after '-' or ' ' */
- name[0] = toupper (name[0]);
+ name[0] = c_toupper (name[0]);
for (len =strlen (name), i =0; i<len; i++)
{
if (name[i] == '$')
{
name[i] = '-';
if (i+1<len)
- name[i+1] = toupper (name[i+1]);
+ name[i+1] = c_toupper (name[i+1]);
}
else if (name[i] == '_')
{
name[i] = ' ';
if (i+1<len)
- name[i+1] = toupper (name[i+1]);
+ name[i+1] = c_toupper (name[i+1]);
}
}
/*fprintf (stderr, "converted '%s' to '%s'\n",xlfd,name); */
=== modified file 'src/syntax.c'
--- a/src/syntax.c 2012-08-16 03:13:44 +0000
+++ b/src/syntax.c 2012-08-16 21:58:44 +0000
@@ -20,7 +20,6 @@
#include <config.h>
-#include <ctype.h>
#include <sys/types.h>
#include <setjmp.h>
#include "lisp.h"
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2012-08-07 07:42:34 +0000
+++ b/src/sysdep.c 2012-08-16 21:58:44 +0000
@@ -21,7 +21,6 @@
#define SYSTIME_INLINE EXTERN_INLINE
-#include <ctype.h>
#include <signal.h>
#include <stdio.h>
#include <setjmp.h>
@@ -33,6 +32,7 @@
#include <unistd.h>
#include <allocator.h>
+#include <c-ctype.h>
#include <careadlinkat.h>
#include <ignore-value.h>
#include <utimens.h>
@@ -2733,7 +2733,7 @@
if (emacs_read (fd, &ch, 1) != 1)
break;
c = ch;
- if (isspace (c) || c == '\\')
+ if (c_isspace (c) || c == '\\')
cmdline_size++; /* for later quoting, see below */
}
if (cmdline_size)
@@ -2757,7 +2757,7 @@
for (p = cmdline; p < cmdline + nread; p++)
{
/* Escape-quote whitespace and backslashes. */
- if (isspace (*p) || *p == '\\')
+ if (c_isspace (*p) || *p == '\\')
{
memmove (p + 1, p, nread - (p - cmdline));
nread++;
=== modified file 'src/term.c'
--- a/src/term.c 2012-08-13 03:44:27 +0000
+++ b/src/term.c 2012-08-16 21:58:44 +0000
@@ -21,7 +21,6 @@
#include <config.h>
#include <stdio.h>
-#include <ctype.h>
#include <errno.h>
#include <sys/file.h>
#include <sys/time.h>
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2012-08-15 07:58:34 +0000
+++ b/src/xfaces.c 2012-08-16 21:58:44 +0000
@@ -279,7 +279,7 @@
#endif /* HAVE_X_WINDOWS */
-#include <ctype.h>
+#include <c-ctype.h>
/* Number of pt per inch (from the TeXbook). */
@@ -4059,7 +4059,7 @@
unsigned hash = 0;
eassert (STRINGP (string));
for (s = SDATA (string); *s; ++s)
- hash = (hash << 1) ^ tolower (*s);
+ hash = (hash << 1) ^ c_tolower (*s);
return hash;
}
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2012-08-15 07:58:34 +0000
+++ b/src/xfns.c 2012-08-16 21:58:44 +0000
@@ -49,7 +49,6 @@
#ifdef HAVE_X_WINDOWS
-#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2012-08-13 03:44:27 +0000
+++ b/src/xterm.c 2012-08-16 21:58:44 +0000
@@ -50,7 +50,6 @@
#include "systime.h"
#include <fcntl.h>
-#include <ctype.h>
#include <errno.h>
#include <setjmp.h>
#include <sys/stat.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109647: Use ASCII tests for character types.,
Paul Eggert <=