mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-15 03:11:54 -07:00
Code Issues Projects Releases Wiki Activity

(read_minibuf): Handle bytes vs chars

Browse source 
when checking for junk at end of expression.
This commit is contained in:
Richard M. Stallman 1998-01-05 17:14:29 +00:00
parent af2b7cd5d6
commit 82d6226f4e
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/minibuf.c
View file

@ -470,12 +470,22 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
{
Lisp_Object expr_and_pos;
unsigned char *p;
int pos;
expr_and_pos = Fread_from_string (val, Qnil, Qnil);
/* Ignore trailing whitespace; any other trailing junk is an error. */
for (p = XSTRING (val)->data + XINT (Fcdr (expr_and_pos)); *p; p++)
if (*p != ' ' && *p != '\t' && *p != '\n')
error ("Trailing garbage following expression");
pos = XINT (Fcdr (expr_and_pos));
if (pos != XSTRING (val)->size)
{
/* Ignore trailing whitespace; any other trailing junk is an error. */
int i;
pos = string_char_to_byte (val, pos);
for (i = pos; i < XSTRING (val)->size_byte; i++)
{
int c = XSTRING (val)->data[i];
if (c != ' ' && c != '\t' && c != '\n')
error ("Trailing garbage following expression");
}
}
val = Fcar (expr_and_pos);
}