diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-02-18 17:59:38 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-02-18 17:59:38 +0100 |
| commit | 9b977c836bf147d386944c401113aba32776fa68 (patch) | |
| tree | d097e1a2376e26bc6b03447445ae239d5514a7a8 /meta | |
| parent | 180ac9d7b0bac97bdead2813a1b0b23d19002c3e (diff) | |
| parent | 739941679c2c7dc36c29c30aff7d4c1b436ba773 (diff) | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/array-handle.c
libguile/deprecated.h
libguile/inline.c
libguile/inline.h
module/ice-9/deprecated.scm
module/language/tree-il/peval.scm
Diffstat (limited to 'meta')
| -rwxr-xr-x | meta/guild.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/guild.in b/meta/guild.in index 183323f75..d501a0daf 100755 --- a/meta/guild.in +++ b/meta/guild.in @@ -8,7 +8,7 @@ exec ${GUILE:-@bindir@/@guile_program_name@} $GUILE_FLAGS -e '(@@ (guild) main)' ;;;; guild --- running scripts bundled with Guile ;;;; Andy Wingo <wingo@pobox.com> --- April 2009 ;;;; -;;;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. +;;;; Copyright (C) 2009, 2010, 2011, 2013 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 @@ -51,7 +51,13 @@ exec ${GUILE:-@bindir@/@guile_program_name@} $GUILE_FLAGS -e '(@@ (guild) main)' (define (main args) (if (defined? 'setlocale) - (setlocale LC_ALL "")) + (catch 'system-error + (lambda () + (setlocale LC_ALL "")) + (lambda args + (format (current-error-port) + "warning: failed to install locale: ~a~%" + (strerror (system-error-errno args)))))) (let* ((options (getopt-long args *option-grammar* #:stop-at-first-non-option #t)) |