(__mktime_internal): Merge changes from gnulib

[gnu-emacs] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index 29f164e34e962ab875d59e8439ea4c1360db9ab1..88f6a452236a95e4a0a78e7e2d2d5f693725d15b 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1,5 +1,5 @@
 /* Updating of data structures for redisplay.
-   Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 1999, 2000, 2001, 2002
+   Copyright (C) 1985,86,87,88,93,94,95,97,98,1999,2000,01,02,2003
        Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -5732,7 +5732,6 @@ mode_line_string (w, x, y, part, charpos)
 {
   struct glyph_row *row;
   struct glyph *glyph, *end;
-  struct frame *f = XFRAME (w->frame);
   int x0;
   Lisp_Object string = Qnil;
 
@@ -6266,7 +6265,10 @@ An obsolete but still supported form is
 Where the optional arg MILLISECONDS specifies an additional wait period,
 in milliseconds; this was useful when Emacs was built without
 floating point support.
-usage: (sit-for SECONDS &optional NODISP) */)
+usage: (sit-for SECONDS &optional NODISP OLD-NODISP) */)
+
+/* The `old-nodisp' stuff is there so that the arglist has the correct
+   length.  Otherwise, `defdvice' will redefine it with fewer args.  */
      (seconds, milliseconds, nodisp)
      Lisp_Object seconds, milliseconds, nodisp;
 {