Changeset 13199


Ignore:
Timestamp:
Nov 13, 2009, 12:19:53 PM (10 years ago)
Author:
gz
Message:

Merge r13198

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lib/format.lisp

    r13187 r13199  
    25902590(defun format-scan-goto (colon atsign count)
    25912591  (if atsign
    2592     (progn
     2592    (let* ((orig *format-original-arguments*)
     2593           (orig-pos (- (length orig) (length *format-arguments*)))
     2594           (new-pos (or count 0)))
    25932595      (format-no-flags colon nil)
    2594       (setq *format-arguments*
    2595             (nthcdr-no-overflow (or count 0) *format-original-arguments*))
    2596       (setq *format-arguments-variance* 0))
     2596      ;; After backing up, we may not use up all the arguments we backed over,
     2597      ;; so even though real variance here is 0, increase variance so we don't
     2598      ;; complain.
     2599      (setq *format-arguments-variance* (max 0 (- orig-pos new-pos)))
     2600      (setq *format-arguments* (nthcdr-no-overflow new-pos orig)))
    25972601    (progn
    25982602      (when (null count)(setq count 1))
Note: See TracChangeset for help on using the changeset viewer.