From fc0d605d18250bb9edc19b13a3a6cdddbc734b5e Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 6 Sep 2012 10:44:40 -0600
Subject: [PATCH] change `log-error', etc., to support format mode

One subexpression => string literal. Multiple subexpressions
=> arguments to `format'.
---
 collects/racket/private/more-scheme.rkt      |  4 +++-
 collects/scribblings/reference/logging.scrbl | 23 ++++++++++++--------
 doc/release-notes/racket/HISTORY.txt         |  1 +
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/collects/racket/private/more-scheme.rkt b/collects/racket/private/more-scheme.rkt
index ab427819fe..90545832bb 100644
--- a/collects/racket/private/more-scheme.rkt
+++ b/collects/racket/private/more-scheme.rkt
@@ -345,7 +345,9 @@
        #'(define-syntax (id stx)
            (syntax-case stx ()
              [(_ str-expr)
-              #'(log-it id mode str-expr)]))]))
+              #'(log-it id mode str-expr)]
+             [(_ str-expr arg (... ...))
+              #'(log-it id mode (format str-expr arg (... ...)))]))]))
   (define-log log-fatal fatal)
   (define-log log-error error)
   (define-log log-warning warning)
diff --git a/collects/scribblings/reference/logging.scrbl b/collects/scribblings/reference/logging.scrbl
index 52ebeeed64..5dd76184f6 100644
--- a/collects/scribblings/reference/logging.scrbl
+++ b/collects/scribblings/reference/logging.scrbl
@@ -130,18 +130,23 @@ currently returns @racket[#f] for all levels.}
 
 
 @deftogether[(
-@defform[(log-fatal string-expr)]
-@defform[(log-error string-expr)]
-@defform[(log-warning string-expr)]
-@defform[(log-info string-expr)]
-@defform[(log-debug string-expr)]
+@defform*[[(log-fatal string-expr)
+           (log-fatal format-string-expr v ...)]]
+@defform*[[(log-error string-expr)
+           (log-error format-string-expr v ...)]]
+@defform*[[(log-warning string-expr)
+           (log-warning format-string-expr v ...)]]
+@defform*[[(log-info string-expr)
+           (log-info format-string-expr v ...)]]
+@defform*[[(log-debug string-expr)
+           (log-debug format-string-expr v ...)]]
 )]{
 
 Log an event with the @tech{current logger}, evaluating
-@racket[string-expr] only if the logger has receivers that are
-interested in the event. In addition, the current continuation's
-@tech{continuation marks} are sent to the logger with the message
-string.
+@racket[string-expr] or @racket[(format format-string-expr v ...)]
+only if the logger has receivers that are interested in the event. In
+addition, the current continuation's @tech{continuation marks} are
+sent to the logger with the message string.
 
 For each @racketkeywordfont{log-}@racket[_level],
 
diff --git a/doc/release-notes/racket/HISTORY.txt b/doc/release-notes/racket/HISTORY.txt
index a7f739ca04..4d842d1ea5 100644
--- a/doc/release-notes/racket/HISTORY.txt
+++ b/doc/release-notes/racket/HISTORY.txt
@@ -1,6 +1,7 @@
 Version 5.3.0.22
 Changed a thread's initial prompt to use the default handler
  (instead of accepting and ignoring abort arguments)
+Changed log-error, etc., to support format mode
 Added racket/format, which is re-exported by racket
 ffi/unsafe: added cpointer-gcable?
 racket/class: added dynamic-get-field and dynamic-set-field!