Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 638-652)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177

1 files changed, 4 insertions, 4 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 3e27ca0cf43..70cfac36fb1 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3528,7 +3528,7 @@ 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]+
+where flags is [-+ #0]+, width is [0-9]+, and precision is .[0-9]+
 
 usage: (format STRING &rest OBJECTS)  */)
      (nargs, args)
@@ -3641,7 +3641,7 @@ usage: (format STRING &rest OBJECTS)  */)
 
            where
 
-           flags        ::= [- #0]+
+           flags        ::= [-+ #0]+
            field-width  ::= [0-9]+
            precision    ::= '.' [0-9]*
 
@@ -3655,7 +3655,7 @@ usage: (format STRING &rest OBJECTS)  */)
 
         while (format != end
                && (*format == '-' || *format == '0' || *format == '#'
-                   || * format == ' '))
+                   || * format == ' ' || *format == '+'))
           ++format;
 
         if (*format >= '0' && *format <= '9')
@@ -3832,7 +3832,7 @@ usage: (format STRING &rest OBJECTS)  */)
           discarded[format - format_start] = 1;
           format++;
 
-          while (index("-0# ", *format))
+          while (index("-+0# ", *format))
             {
               if (*format == '-')
                 {