diff options
| author | Paul Eggert | 2011-02-06 12:12:53 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-06 12:12:53 -0800 |
| commit | 637de37e96e8521d5d7fb83aa800eea52b12609a (patch) | |
| tree | 783ac9a89817f95f55bc31b11d7ca09502d0b9e3 /src | |
| parent | 01c9aa3af4214b6d70b0e8d372df68ce6884a898 (diff) | |
| download | emacs-637de37e96e8521d5d7fb83aa800eea52b12609a.tar.gz emacs-637de37e96e8521d5d7fb83aa800eea52b12609a.zip | |
* minibuf.c: conform to C89 pointer rules
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/minibuf.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5e2831ea67e..84b32f3455e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * keyboard.c (echo_char, MULTI_LETTER_MOD, tty_read_avail_input): | 18 | * keyboard.c (echo_char, MULTI_LETTER_MOD, tty_read_avail_input): |
| 19 | Likewise. | 19 | Likewise. |
| 20 | * keymap.c (Ftext_char_description): Likewise. | 20 | * keymap.c (Ftext_char_description): Likewise. |
| 21 | * minibuf.c (Fread_buffer): Likewise. | ||
| 21 | * insdel.c (insert, insert_and_inherit, insert_before_markers): | 22 | * insdel.c (insert, insert_and_inherit, insert_before_markers): |
| 22 | (insert_before_markers_and_inherit, insert_1, insert_1_both): | 23 | (insert_before_markers_and_inherit, insert_1, insert_1_both): |
| 23 | Likewise. This changes these functions' signatures, which is | 24 | Likewise. This changes these functions' signatures, which is |
diff --git a/src/minibuf.c b/src/minibuf.c index 921657b450a..ec243daac19 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -1091,7 +1091,7 @@ function, instead of the usual behavior. */) | |||
| 1091 | (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match) | 1091 | (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match) |
| 1092 | { | 1092 | { |
| 1093 | Lisp_Object args[4], result; | 1093 | Lisp_Object args[4], result; |
| 1094 | unsigned char *s; | 1094 | char *s; |
| 1095 | int len; | 1095 | int len; |
| 1096 | int count = SPECPDL_INDEX (); | 1096 | int count = SPECPDL_INDEX (); |
| 1097 | 1097 | ||
| @@ -1113,7 +1113,7 @@ function, instead of the usual behavior. */) | |||
| 1113 | 1113 | ||
| 1114 | if (STRINGP (prompt)) | 1114 | if (STRINGP (prompt)) |
| 1115 | { | 1115 | { |
| 1116 | s = SDATA (prompt); | 1116 | s = SSDATA (prompt); |
| 1117 | len = strlen (s); | 1117 | len = strlen (s); |
| 1118 | if (len >= 2 && s[len - 2] == ':' && s[len - 1] == ' ') | 1118 | if (len >= 2 && s[len - 2] == ':' && s[len - 1] == ' ') |
| 1119 | len = len - 2; | 1119 | len = len - 2; |