[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src doprnt.c lisp.h ChangeLog
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] emacs/src doprnt.c lisp.h ChangeLog |
Date: |
Mon, 10 Aug 2009 00:54:04 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Ken Raeburn <raeburn> 09/08/10 00:54:04
Modified files:
src : doprnt.c lisp.h ChangeLog
Log message:
* doprnt.c (doprnt_lisp): Unused function deleted.
(doprnt): Merge with doprnt1, discarding lispstrings code.
* lisp.h (doprnt_lisp): Don't declare.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/doprnt.c?cvsroot=emacs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.658&r2=1.659
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7677&r2=1.7678
Patches:
Index: doprnt.c
===================================================================
RCS file: /sources/emacs/emacs/src/doprnt.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- doprnt.c 8 Jan 2009 03:15:33 -0000 1.52
+++ doprnt.c 10 Aug 2009 00:54:02 -0000 1.53
@@ -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);
- }
width = strwidth (string, tem);
goto doit1;
Index: lisp.h
===================================================================
RCS file: /sources/emacs/emacs/src/lisp.h,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -b -r1.658 -r1.659
--- lisp.h 6 May 2009 02:26:52 -0000 1.658
+++ lisp.h 10 Aug 2009 00:54:02 -0000 1.659
@@ -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;
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7677
retrieving revision 1.7678
diff -u -b -r1.7677 -r1.7678
--- ChangeLog 7 Aug 2009 13:55:00 -0000 1.7677
+++ ChangeLog 10 Aug 2009 00:54:02 -0000 1.7678
@@ -1,3 +1,9 @@
+2009-08-10 Ken Raeburn <address@hidden>
+
+ * 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 <address@hidden>
* puresize.h (BASE_PURESIZE): Increase to 1270000.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src doprnt.c lisp.h ChangeLog,
Ken Raeburn <=