Mercurial > emacs
comparison src/editfns.c @ 83185:09f3fd9f680d
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-473
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-474
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-475
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-476
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-477
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-478
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-225
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 03 Aug 2004 12:45:59 +0000 |
parents | 1a84eb100ef3 |
children | d2baef38bbd7 0bdb5a16ae51 |
comparison
equal
deleted
inserted
replaced
83184:7aa4bb74fe30 | 83185:09f3fd9f680d |
---|---|
3252 if (STRINGP (args[n]) && STRING_MULTIBYTE (args[n])) | 3252 if (STRINGP (args[n]) && STRING_MULTIBYTE (args[n])) |
3253 multibyte = 1; | 3253 multibyte = 1; |
3254 /* Piggyback on this loop to initialize precision[N]. */ | 3254 /* Piggyback on this loop to initialize precision[N]. */ |
3255 precision[n] = -1; | 3255 precision[n] = -1; |
3256 } | 3256 } |
3257 precision[nargs] = -1; | |
3257 | 3258 |
3258 CHECK_STRING (args[0]); | 3259 CHECK_STRING (args[0]); |
3259 /* We may have to change "%S" to "%s". */ | 3260 /* We may have to change "%S" to "%s". */ |
3260 args[0] = Fcopy_sequence (args[0]); | 3261 args[0] = Fcopy_sequence (args[0]); |
3261 | 3262 |
3275 /* Make room in result for all the non-%-codes in the control string. */ | 3276 /* Make room in result for all the non-%-codes in the control string. */ |
3276 total = 5 + CONVERTED_BYTE_SIZE (multibyte, args[0]) + 1; | 3277 total = 5 + CONVERTED_BYTE_SIZE (multibyte, args[0]) + 1; |
3277 | 3278 |
3278 /* Allocate the info and discarded tables. */ | 3279 /* Allocate the info and discarded tables. */ |
3279 { | 3280 { |
3280 int nbytes = nargs * sizeof *info; | 3281 int nbytes = (nargs+1) * sizeof *info; |
3281 int i; | 3282 int i; |
3282 info = (struct info *) alloca (nbytes); | 3283 info = (struct info *) alloca (nbytes); |
3283 bzero (info, nbytes); | 3284 bzero (info, nbytes); |
3284 for (i = 0; i < nargs; i++) | 3285 for (i = 0; i <= nargs; i++) |
3285 info[i].start = -1; | 3286 info[i].start = -1; |
3286 discarded = (char *) alloca (SBYTES (args[0])); | 3287 discarded = (char *) alloca (SBYTES (args[0])); |
3287 bzero (discarded, SBYTES (args[0])); | 3288 bzero (discarded, SBYTES (args[0])); |
3288 } | 3289 } |
3289 | 3290 |