[Guile-commits] GNU Guile branch, master, updated. v2.1.0-134-gbb9b357

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=bb9b357e2b98cea82f844115ee5f66704bb6a1c8

The branch, master has been updated
       via  bb9b357e2b98cea82f844115ee5f66704bb6a1c8 (commit)
       via  fcd68d8e88796eaeb8f9ed41d4afe5fa30e01efd (commit)
      from  4f2b34ff640060ec7e75a922db110d7850b6c1c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb9b357e2b98cea82f844115ee5f66704bb6a1c8
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 22 12:11:48 2011 +0100

    Install the current locale when Guile is invoked directly.
    
    * libguile/guile.c (main): Add `setlocale' call.

commit fcd68d8e88796eaeb8f9ed41d4afe5fa30e01efd
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 22 12:03:32 2011 +0100

    Add Gnulib `largefile' module.
    
    It will really be added next time we run "gnulib-tool --update".

-----------------------------------------------------------------------

Summary of changes:
 libguile/guile.c   |   14 ++++++++++++--
 m4/gnulib-cache.m4 |    3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libguile/guile.c b/libguile/guile.c
index 6da547b..1ed28d5 100644
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1996,1997,2000,2001, 2006, 2008 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1996, 1997, 2000, 2001, 2006, 2008,
+ *   2011 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 License
  * as published by the Free Software Foundation; either version 3 of
@@ -36,6 +37,7 @@
 #include <libguile/scmconfig.h>
 #endif
 #include <ltdl.h>
+#include <locale.h>
 
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
@@ -67,6 +69,14 @@ inner_main (void *closure SCM_UNUSED, int argc, char **argv)
 int
 main (int argc, char **argv)
 {
+  /* Install the locale right at the beginning so that string conversion
+     for command-line arguments, along with possible error messages, use
+     the right locale.  See
+     <https://lists.gnu.org/archive/html/guile-devel/2011-11/msg00041.html>
+     for the rationale.  */
+  if (setlocale (LC_ALL, "") == NULL)
+    fprintf (stderr, "guile: warning: failed to install locale\n");
+
   scm_boot_guile (argc, argv, inner_main, 0);
   return 0; /* never reached */
 }
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 2bc1444..d9688f4 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 
--doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept 
alignof alloca-opt announce-gen autobuild bind byteswap canonicalize-lgpl ceil 
close connect duplocale environ extensions flock floor fpieee frexp full-read 
full-write func gendocs getaddrinfo getpeername getsockname getsockopt 
git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib 
iconv_open-utf inet_ntop inet_pton isinf isnan ldexp lib-symbol-versions 
lib-symbol-visibility libunistring listen locale log1p maintainer-makefile 
malloc-gnu malloca nproc open pipe2 putenv recv recvfrom rename send sendto 
setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat 
trunc verify vsnprintf warnings wchar
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 
--doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept 
alignof alloca-opt announce-gen autobuild bind byteswap canonicalize-lgpl ceil 
close connect duplocale environ extensions flock floor fpieee frexp full-read 
full-write func gendocs getaddrinfo getpeername getsockname getsockopt 
git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib 
iconv_open-utf inet_ntop inet_pton isinf isnan largefile ldexp 
lib-symbol-versions lib-symbol-visibility libunistring listen locale log1p 
maintainer-makefile malloc-gnu malloca nproc open pipe2 putenv recv recvfrom 
rename send sendto setsockopt shutdown socket stat-time stdlib strftime 
striconveh string sys_stat trunc verify vsnprintf warnings wchar
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -68,6 +68,7 @@ gl_MODULES([
   inet_pton
   isinf
   isnan
+  largefile
   ldexp
   lib-symbol-versions
   lib-symbol-visibility


hooks/post-receive
-- 
GNU Guile