Mercurial > emacs
changeset 104223:ec260849ffe1
* doprnt.c (doprnt_lisp): Unused function deleted.
(doprnt): Merge with doprnt1, discarding lispstrings code.
* lisp.h (doprnt_lisp): Don't declare.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Mon, 10 Aug 2009 00:54:02 +0000 |
| parents | f5dfc04abb5c |
| children | bd10839bac0e |
| files | src/ChangeLog src/doprnt.c src/lisp.h |
| diffstat | 3 files changed, 8 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Aug 09 23:39:59 2009 +0000 +++ b/src/ChangeLog Mon Aug 10 00:54:02 2009 +0000 @@ -1,3 +1,9 @@ +2009-08-10 Ken Raeburn <raeburn@raeburn.org> + + * doprnt.c (doprnt_lisp): Unused function deleted. + (doprnt): Merge with doprnt1, discarding lispstrings code. + * lisp.h (doprnt_lisp): Don't declare. + 2009-08-07 Juri Linkov <juri@jurta.org> * puresize.h (BASE_PURESIZE): Increase to 1270000.
--- a/src/doprnt.c Sun Aug 09 23:39:59 2009 +0000 +++ b/src/doprnt.c Mon Aug 10 00:54:02 2009 +0000 @@ -68,34 +68,6 @@ int nargs; char **args; { - return doprnt1 (0, buffer, bufsize, format, format_end, nargs, args); -} - -/* Like doprnt except that strings in ARGS are passed - as Lisp_Object. */ - -int -doprnt_lisp (buffer, bufsize, format, format_end, nargs, args) - char *buffer; - register int bufsize; - char *format; - char *format_end; - int nargs; - char **args; -{ - return doprnt1 (1, buffer, bufsize, format, format_end, nargs, args); -} - -static int -doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args) - int lispstrings; - char *buffer; - register int bufsize; - char *format; - char *format_end; - int nargs; - char **args; -{ int cnt = 0; /* Number of arg to gobble next */ register char *fmt = format; /* Pointer into format string */ register char *bufptr = buffer; /* Pointer into output buffer.. */ @@ -235,17 +207,8 @@ error ("Not enough arguments for format string"); if (fmtcpy[1] != 's') minlen = atoi (&fmtcpy[1]); - if (lispstrings) - { - string = ((struct Lisp_String *) args[cnt])->data; - tem = STRING_BYTES ((struct Lisp_String *) args[cnt]); - cnt++; - } - else - { - string = (unsigned char *) args[cnt++]; - tem = strlen (string); - } + string = (unsigned char *) args[cnt++]; + tem = strlen (string); width = strwidth (string, tem); goto doit1;
--- a/src/lisp.h Sun Aug 09 23:39:59 2009 +0000 +++ b/src/lisp.h Mon Aug 10 00:54:02 2009 +0000 @@ -2681,7 +2681,6 @@ /* Defined in doprnt.c */ extern int doprnt P_ ((char *, int, char *, char *, int, char **)); -extern int doprnt_lisp P_ ((char *, int, char *, char *, int, char **)); /* Defined in lread.c */ extern Lisp_Object Qvariable_documentation, Qstandard_input;