diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-11 21:27:53 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-11 21:27:53 -0500 |
| commit | c530e1c2a3a036d71942c354ba11b30a06341fd7 (patch) | |
| tree | 184fa6b6c9bb58855aa9f1ae6cded97edc4f10fb /src/minibuf.c | |
| parent | 295fb2ac59b66c0e2470325a42c8e58c135ed044 (diff) | |
| parent | e0e36cac4adaa32ad755a34c811366dd8e4655bc (diff) | |
| download | emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.tar.gz | |
Merge from trunk
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index a19a650d008..67b4e824561 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1092,7 +1092,7 @@ function, instead of the usual behavior. */) (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match) { Lisp_Object args[4], result; - unsigned char *s; + char *s; int len; int count = SPECPDL_INDEX (); @@ -1114,7 +1114,7 @@ function, instead of the usual behavior. */) if (STRINGP (prompt)) { - s = SDATA (prompt); + s = SSDATA (prompt); len = strlen (s); if (len >= 2 && s[len - 2] == ':' && s[len - 1] == ' ') len = len - 2; |