(Fregister_ccl_program): Fix typos in docstring.

[gnu-emacs] / src / doprnt.c

diff --git a/src/doprnt.c b/src/doprnt.c
index 7bcb6741677821faadd51965b1802bd502342409..1cfc5aecee635521be96069ebb75ca8b0ae2f8de 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #include <config.h>
@@ -54,7 +54,7 @@ static int doprnt1 ();
    terminated at position FORMAT_END.
    Output goes in BUFFER, which has room for BUFSIZE chars.
    If the output does not fit, truncate it to fit.
-   Returns the number of characters stored into BUFFER.
+   Returns the number of bytes stored into BUFFER.
    ARGS points to the vector of arguments, and NARGS says how many.
    A double counts as two arguments.
    String arguments are passed as C strings.
@@ -221,7 +221,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
              {
                union { double d; char *half[2]; } u;
                if (cnt + 1 == nargs)
-                 error ("not enough arguments for format string");
+                 error ("Not enough arguments for format string");
                u.half[0] = args[cnt++];
                u.half[1] = args[cnt++];
                sprintf (sprintf_buffer, fmtcpy, u.d);
@@ -234,13 +234,13 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
              string[-1] = 's';
            case 's':
              if (cnt == nargs)
-               error ("not enough arguments for format string");
+               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 = ((struct Lisp_String *)args[cnt])->size;
+                 tem = STRING_BYTES ((struct Lisp_String *)args[cnt]);
                  cnt++;
                }
              else
@@ -297,7 +297,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
 
            case 'c':
              if (cnt == nargs)
-               error ("not enough arguments for format string");
+               error ("Not enough arguments for format string");
              tem = CHAR_STRING ((int) (EMACS_INT) args[cnt], charbuf);
              string = charbuf;
              cnt++;
@@ -334,3 +334,6 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
   *bufptr = 0;         /* Make sure our string end with a '\0' */
   return bufptr - buffer;
 }
+
+/* arch-tag: aa0ab528-7c5f-4c73-894c-aa2526a1efb3
+   (do not change this comment) */