[Emacs-diffs] Changes to emacs/src/editfns.c

[Richard M. Stallman]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.324 emacs/src/editfns.c:1.325
*** emacs/src/editfns.c:1.324   Mon Dec 17 21:15:53 2001
--- emacs/src/editfns.c Wed Jan  2 14:56:50 2002
***************
*** 3217,3222 ****
--- 3217,3223 ----
      if (*format++ == '%')
        {
        int thissize = 0;
+       int actual_width = 0;
        unsigned char *this_format_start = format - 1;
        int field_width, precision;
  
***************
*** 3297,3302 ****
--- 3298,3304 ----
            if (*format != 's' && *format != 'S')
              error ("Format specifier doesn't match argument type");
            thissize = CONVERTED_BYTE_SIZE (multibyte, args[n]);
+           actual_width = lisp_string_width (args[n], -1, NULL, NULL);
          }
        /* Would get MPV otherwise, since Lisp_Int's `point' to low memory.  */
        else if (INTEGERP (args[n]) && *format != 's')
***************
*** 3350,3356 ****
            goto string;
          }
  
!       thissize = max (field_width, thissize);
        total += thissize + 4;
        }
  
--- 3352,3358 ----
            goto string;
          }
  
!       thissize += max (0, field_width - actual_width);
        total += thissize + 4;
        }