summaryrefslogtreecommitdiff
path: root/module/system
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-01-30 19:59:08 +0100
committerAndy Wingo <wingo@pobox.com>2012-01-30 20:27:35 +0100
commitdfadcf85cb3ae9133dece6bc39ed03dd25323d6e (patch)
tree93c918a793ee86c8406fd1bac521ea2b870361cf /module/system
parent252acfe8e70ac4c7d325588ffea1905fcf6f86b2 (diff)
parente1fbe716e8596b7027af57623ebc72a0c6393187 (diff)
downloadguile-dfadcf85cb3ae9133dece6bc39ed03dd25323d6e.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: libguile/debug.h module/ice-9/psyntax-pp.scm module/ice-9/psyntax.scm module/language/tree-il/peval.scm module/language/tree-il/primitives.scm
Diffstat (limited to 'module/system')
-rw-r--r--module/system/base/message.scm6
-rw-r--r--module/system/repl/common.scm2
-rw-r--r--module/system/repl/error-handling.scm3
3 files changed, 8 insertions, 3 deletions
diff --git a/module/system/base/message.scm b/module/system/base/message.scm
index 75e14ea1e..8cf285afd 100644
--- a/module/system/base/message.scm
+++ b/module/system/base/message.scm
@@ -1,6 +1,6 @@
;;; User interface messages
-;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Lesser General Public
@@ -150,6 +150,10 @@
(emit #f "~a to ~a" min max))))
(match rest
+ (('simple-format fmt opt)
+ (emit port
+ "~A: warning: ~S: unsupported format option ~~~A, use (ice-9 format) instead~%"
+ loc (escape-newlines fmt) opt))
(('wrong-format-arg-count fmt min max actual)
(emit port
"~A: warning: ~S: wrong number of `format' arguments: expected ~A, got ~A~%"
diff --git a/module/system/repl/common.scm b/module/system/repl/common.scm
index 6c6ee2ae7..346ba990f 100644
--- a/module/system/repl/common.scm
+++ b/module/system/repl/common.scm
@@ -39,7 +39,7 @@
(define *version*
(format #f "GNU Guile ~A
-Copyright (C) 1995-2011 Free Software Foundation, Inc.
+Copyright (C) 1995-2012 Free Software Foundation, Inc.
Guile comes with ABSOLUTELY NO WARRANTY; for details type `,show w'.
This program is free software, and you are welcome to redistribute it
diff --git a/module/system/repl/error-handling.scm b/module/system/repl/error-handling.scm
index 2a585aaff..0e31eb941 100644
--- a/module/system/repl/error-handling.scm
+++ b/module/system/repl/error-handling.scm
@@ -1,6 +1,6 @@
;;; Error handling in the REPL
-;; Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,7 @@
#:use-module (system base pmatch)
#:use-module (system vm trap-state)
#:use-module (system repl debug)
+ #:use-module (ice-9 format)
#:export (call-with-error-handling
with-error-handling))