aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorPaul Eggert2011-02-06 11:44:36 -0800
committerPaul Eggert2011-02-06 11:44:36 -0800
commitb68864e5b9b695570d35dd7c41d5d010ba7cc87d (patch)
tree4ca664d771a5b7482d1a726406cbfd4d46531fb8 /src/editfns.c
parentf8b351c190ecb3d01bd81a0c4624153b15a95f89 (diff)
downloademacs-b68864e5b9b695570d35dd7c41d5d010ba7cc87d.tar.gz
emacs-b68864e5b9b695570d35dd7c41d5d010ba7cc87d.zip
* insdel.c: conform to C89 pointer rules
Diffstat (limited to 'src/editfns.c')
-rw-r--r--src/editfns.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/editfns.c b/src/editfns.c
index f70b3312a69..3b14379be11 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -94,7 +94,7 @@ static void update_buffer_properties (EMACS_INT, EMACS_INT);
94static Lisp_Object region_limit (int); 94static Lisp_Object region_limit (int);
95static size_t emacs_nmemftime (char *, size_t, const char *, 95static size_t emacs_nmemftime (char *, size_t, const char *,
96 size_t, const struct tm *, int, int); 96 size_t, const struct tm *, int, int);
97static void general_insert_function (void (*) (const unsigned char *, EMACS_INT), 97static void general_insert_function (void (*) (const char *, EMACS_INT),
98 void (*) (Lisp_Object, EMACS_INT, 98 void (*) (Lisp_Object, EMACS_INT,
99 EMACS_INT, EMACS_INT, 99 EMACS_INT, EMACS_INT,
100 EMACS_INT, int), 100 EMACS_INT, int),
@@ -2118,7 +2118,7 @@ set_time_zone_rule (const char *tzstring)
2118 2118
2119static void 2119static void
2120general_insert_function (void (*insert_func) 2120general_insert_function (void (*insert_func)
2121 (const unsigned char *, EMACS_INT), 2121 (const char *, EMACS_INT),
2122 void (*insert_from_string_func) 2122 void (*insert_from_string_func)
2123 (Lisp_Object, EMACS_INT, EMACS_INT, 2123 (Lisp_Object, EMACS_INT, EMACS_INT,
2124 EMACS_INT, EMACS_INT, int), 2124 EMACS_INT, EMACS_INT, int),
@@ -2144,7 +2144,7 @@ general_insert_function (void (*insert_func)
2144 : multibyte_char_to_unibyte (XINT (val), Qnil)); 2144 : multibyte_char_to_unibyte (XINT (val), Qnil));
2145 len = 1; 2145 len = 1;
2146 } 2146 }
2147 (*insert_func) (str, len); 2147 (*insert_func) ((char *) str, len);
2148 } 2148 }
2149 else if (STRINGP (val)) 2149 else if (STRINGP (val))
2150 { 2150 {
@@ -2257,7 +2257,7 @@ The optional third arg INHERIT, if non-nil, says to inherit text properties
2257from adjoining text, if those properties are sticky. */) 2257from adjoining text, if those properties are sticky. */)
2258 (Lisp_Object character, Lisp_Object count, Lisp_Object inherit) 2258 (Lisp_Object character, Lisp_Object count, Lisp_Object inherit)
2259{ 2259{
2260 register unsigned char *string; 2260 register char *string;
2261 register EMACS_INT strlen; 2261 register EMACS_INT strlen;
2262 register int i; 2262 register int i;
2263 register EMACS_INT n; 2263 register EMACS_INT n;
@@ -2277,7 +2277,7 @@ from adjoining text, if those properties are sticky. */)
2277 if (n <= 0) 2277 if (n <= 0)
2278 return Qnil; 2278 return Qnil;
2279 strlen = min (n, 256 * len); 2279 strlen = min (n, 256 * len);
2280 string = (unsigned char *) alloca (strlen); 2280 string = (char *) alloca (strlen);
2281 for (i = 0; i < strlen; i++) 2281 for (i = 0; i < strlen; i++)
2282 string[i] = str[i % len]; 2282 string[i] = str[i % len];
2283 while (n >= strlen) 2283 while (n >= strlen)