Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-53
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-54
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-55
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-56
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-70

5 files changed, 42 insertions, 25 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a15f25fbde8..a71cb27cf33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2004-01-26  Andreas Schwab  <schwab@suse.de>
+
+        * print.c (print_preprocess): Declare size as EMACS_INT to not
+        lose bits.
+        (print_object): Likewise.
+        * alloc.c (Fpurecopy): Likewise.
+
+2004-01-25  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * window.c (Fwindow_minibuffer_p): Doc fix.
+
+2004-01-24  Jonathan Yavner  <jyavner@member.fsf.org>
+
+        * editfns.c (Fformat): Make both passes accept the same set of flags.
+
 2004-01-23  Kenichi Handa  <handa@m17n.org>
 
         * fns.c (Fmd5): If OBJECT is a buffer different from the current
diff --git a/src/alloc.c b/src/alloc.c
index 4afcab2c20a..723d664cbe0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4231,12 +4231,13 @@ Does not copy symbols.  Copies strings without text properties.  */)
   else if (COMPILEDP (obj) || VECTORP (obj))
     {
       register struct Lisp_Vector *vec;
-      register int i, size;
+      register int i;
+      EMACS_INT size;
 
       size = XVECTOR (obj)->size;
       if (size & PSEUDOVECTOR_FLAG)
         size &= PSEUDOVECTOR_SIZE_MASK;
-      vec = XVECTOR (make_pure_vector ((EMACS_INT) size));
+      vec = XVECTOR (make_pure_vector (size));
       for (i = 0; i < size; i++)
         vec->contents[i] = Fpurecopy (XVECTOR (obj)->contents[i]);
       if (COMPILEDP (obj))
diff --git a/src/editfns.c b/src/editfns.c
index a636c35a464..d3039ca0273 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3193,6 +3193,10 @@ It may contain %-sequences meaning to substitute the next argument.
   The argument used for %d, %o, %x, %e, %f, %g or %c must be a number.
 Use %% to put a single % into the output.
 
+The basic structure of a %-sequence is
+  % <flags> <width> <precision> character
+where flags is [- #0]+, width is [0-9]+, and precision is .[0-9]+
+
 usage: (format STRING &rest OBJECTS)  */)
      (nargs, args)
      int nargs;
@@ -3300,7 +3304,7 @@ usage: (format STRING &rest OBJECTS)  */)
 
            where
 
-           flags        ::= [#-* 0]+
+           flags        ::= [- #0]+
            field-width  ::= [0-9]+
            precision    ::= '.' [0-9]*
 
@@ -3312,14 +3316,7 @@ usage: (format STRING &rest OBJECTS)  */)
            digits to print after the '.' for floats, or the max.
            number of chars to print from a string.  */
 
-        /* NOTE the handling of specifiers here differs in some ways
-           from the libc model.  There are bugs in this code that lead
-           to incorrect formatting when flags recognized by C but
-           neither parsed nor rejected here are used.  Further
-           revisions will be made soon.  */
-
-        /* incorrect list of flags to skip; will be fixed */
-        while (index ("-*# 0", *format))
+        while (index ("-0# ", *format))
           ++format;
 
         if (*format >= '0' && *format <= '9')
@@ -3403,7 +3400,7 @@ usage: (format STRING &rest OBJECTS)  */)
             if (*format == 'c')
               {
                 if (! SINGLE_BYTE_CHAR_P (XINT (args[n]))
-                    /* Note: No one can remeber why we have to treat
+                    /* Note: No one can remember why we have to treat
                        the character 0 as a multibyte character here.
                        But, until it causes a real problem, let's
                        don't change it.  */
@@ -3494,17 +3491,19 @@ usage: (format STRING &rest OBJECTS)  */)
           discarded[format - format_start] = 1;
           format++;
 
-          /* Process a numeric arg and skip it.  */
-          /* NOTE atoi is the wrong thing to use here; will be fixed */
+          while (index("-0# ", *format))
+            {
+              if (*format == '-')
+                {
+                  negative = 1;
+                }
+              discarded[format - format_start] = 1;
+              ++format;
+            }
+
           minlen = atoi (format);
-          if (minlen < 0)
-            minlen = - minlen, negative = 1;
-
-          /* NOTE the parsing here is not consistent with the first
-             pass, and neither attempt is what we want to do.  Will be
-             fixed. */
-          while ((*format >= '0' && *format <= '9')
-                 || *format == '-' || *format == ' ' || *format == '.')
+
+          while ((*format >= '0' && *format <= '9') || *format == '.')
             {
               discarded[format - format_start] = 1;
               format++;
diff --git a/src/print.c b/src/print.c
index 597345c129c..89690fe5399 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1276,7 +1276,8 @@ static void
 print_preprocess (obj)
      Lisp_Object obj;
 {
-  int i, size;
+  int i;
+  EMACS_INT size;
 
  loop:
   if (STRINGP (obj) || CONSP (obj) || VECTORP (obj)
@@ -1891,7 +1892,7 @@ print_object (obj, printcharfun, escapeflag)
         }
       else
         {
-          int size = XVECTOR (obj)->size;
+          EMACS_INT size = XVECTOR (obj)->size;
           if (COMPILEDP (obj))
             {
               PRINTCHAR ('#');
diff --git a/src/window.c b/src/window.c
index 14defa74257..363c8d0eaff 100644
--- a/src/window.c
+++ b/src/window.c
@@ -307,7 +307,8 @@ used by that frame.  */)
 }
 
 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0,
-       doc: /* Returns non-nil if WINDOW is a minibuffer window.  */)
+       doc: /* Returns non-nil if WINDOW is a minibuffer window.
+WINDOW defaults to the selected window.  */)
      (window)
      Lisp_Object window;
 {