Mercurial > hg > xemacs-beta
diff src/callint.c @ 14:9ee227acff29 r19-15b90
Import from CVS: tag r19-15b90
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:48:42 +0200 |
| parents | ac2d302a0011 |
| children | 859a2309aef8 |
line wrap: on
line diff
--- a/src/callint.c Mon Aug 13 08:48:18 2007 +0200 +++ b/src/callint.c Mon Aug 13 08:48:42 2007 +0200 @@ -189,7 +189,7 @@ /* Fformat no longer smashes its arg vector, so no need to copy it. */ - if (!strchr ((char *) string_data (XSTRING (s)), '%')) + if (!strchr ((char *) XSTRING_DATA (s), '%')) return (s); GCPRO1 (s); RETURN_UNGCPRO (emacs_doprnt_string_lisp (0, s, 0, nargs, args)); @@ -421,7 +421,7 @@ for (;;) { if (STRINGP (specs)) - prompt_data = (CONST char *) string_data (XSTRING (specs)); + prompt_data = (CONST char *) XSTRING_DATA (specs); if (prompt_data[prompt_index] == '+') error ("`+' is not used in `interactive' for ordinary commands"); @@ -614,7 +614,7 @@ int shadowing_speccount = specpdl_depth (); specbind (Qcursor_in_echo_area, Qt); - message ("%s", string_data (XSTRING (PROMPT ()))); + message ("%s", XSTRING_DATA (PROMPT ())); tem = (call0 (Qread_char)); args[argnum] = tem; /* visargs[argnum] = Fsingle_key_description (tem); */ @@ -865,7 +865,7 @@ if (!prompt_limit) break; if (STRINGP (specs)) - prompt_data = (CONST char *) string_data (XSTRING (specs)); + prompt_data = (CONST char *) XSTRING_DATA (specs); prompt_index += prompt_length + 1 + 1; /* +1 to skip spec, +1 for \n */ } unbind_to (speccount, Qnil);