[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-9-g21982d6

[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=21982d68ab11580cbe35dee2f98334e09545fd93

The branch, stable-2.0 has been updated
       via  21982d68ab11580cbe35dee2f98334e09545fd93 (commit)
       via  afdf5467e5d8f9b1c13cae2d2cc0679a710d2403 (commit)
       via  9977b316434c6ac59e0224fd530ab8065f2cc938 (commit)
       via  cc948107089bf9a8aee25f33f46c8b1dfa914ae6 (commit)
       via  4578dc947922d79cf7ffd937c46ae6bd261ef6a4 (commit)
      from  8f63b9b670899c9a1a6e017e8979614a9b4b649b (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 21982d68ab11580cbe35dee2f98334e09545fd93
Author: Ludovic Courtès <address@hidden>
Date:   Mon Dec 10 23:38:48 2012 +0100

    build: Require Automake 1.11.2 or later.
    
    * configure.ac: Require Automake 1.11.2 or later.
      Reported by Sjoerd van Leent Privé <address@hidden>
      in <http://bugs.gnu.org/13117>.

commit afdf5467e5d8f9b1c13cae2d2cc0679a710d2403
Author: Daniel Hartwig <address@hidden>
Date:   Tue Dec 4 11:41:35 2012 +0800

    repl: add repl-option for customized print
    
    Closes <http://bugs.gnu.org/13077>.
    
    * module/system/repl/common.scm (repl-default-options)
      (repl-print): Add option to use customized print procedure.
    * doc/ref/scheme-using.texi (REPL Commands): Update.

commit 9977b316434c6ac59e0224fd530ab8065f2cc938
Author: Ludovic Courtès <address@hidden>
Date:   Mon Dec 10 23:16:13 2012 +0100

    test-suite: Skip `EACCES' test of `file-system-fold' when run as root.
    
    * test-suite/tests/ftw.test ("file-system-fold")["EACCES"]: Use
      `pass-if-equal'.  Throw `unresolved' when run as root.
      Reported by Andreas Enge <address@hidden> at
      <http://lists.gnu.org/archive/html/bug-guix/2012-12/msg00073.html>.

commit cc948107089bf9a8aee25f33f46c8b1dfa914ae6
Author: Ludovic Courtès <address@hidden>
Date:   Mon Dec 10 23:14:10 2012 +0100

    Verify the value of `SHUT_RD' and related constants.
    
    * libguile/socket.c: Add `verify' clauses for the values of `SHUT_RD',
      `SHUT_WR', and `SHUT_RDWR'.

commit 4578dc947922d79cf7ffd937c46ae6bd261ef6a4
Author: Ludovic Courtès <address@hidden>
Date:   Mon Dec 10 23:12:07 2012 +0100

    doc: Update `release.org'.
    
    * doc/release.org (Use porter boxes): Mention Snakebite.

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

Summary of changes:
 configure.ac                  |    4 ++--
 doc/ref/scheme-using.texi     |    4 ++++
 doc/release.org               |    4 ++--
 libguile/socket.c             |    8 +++++++-
 module/system/repl/common.scm |   21 +++++++++++++++------
 test-suite/tests/ftw.test     |   28 ++++++++++++++++------------
 6 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index be20b8c..783af3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,8 +35,8 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(GUILE-VERSION)
 
-dnl `AM_SUBST_NOTMAKE' was introduced in Automake 1.11.
-AM_INIT_AUTOMAKE([1.11 gnu no-define -Wall -Wno-override color-tests dist-xz])
+dnl `AM_PROG_AR' was introduced in Automake 1.11.2.
+AM_INIT_AUTOMAKE([1.11.2 gnu no-define -Wall -Wno-override color-tests 
dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], 
[AC_SUBST([AM_DEFAULT_VERBOSITY],1)])
 
 AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
diff --git a/doc/ref/scheme-using.texi b/doc/ref/scheme-using.texi
index 7eb84de..4f9e6db 100644
--- a/doc/ref/scheme-using.texi
+++ b/doc/ref/scheme-using.texi
@@ -445,6 +445,10 @@ choice is available.  Off by default (indicating 
compilation).
 @item prompt
 A customized REPL prompt.  @code{#f} by default, indicating the default
 prompt.
address@hidden print
+A procedure of two arguments used to print the result of evaluating each
+expression.  The arguments are the current REPL and the value to print.
+By default, @code{#f}, to use the default procedure.
 @item value-history
 Whether value history is on or not.  @xref{Value History}.
 @item on-error
diff --git a/doc/release.org b/doc/release.org
index 03bf23b..95ba12e 100644
--- a/doc/release.org
+++ b/doc/release.org
@@ -50,8 +50,8 @@ builds on 11 architectures).  It also has FreeBSD and NetBSD 
boxes.
 *** Use porter boxes
 
 If you're still in a good mood, you may also want to check on porter
-boxes for other OSes.  The GNU/Hurd people have 
[[http://www.gnu.org/software/hurd/public_hurd_boxen.html][porter boxes]], so 
does
-the [[http://www.opencsw.org/standards/build_farm][OpenCSW Solaris Team]].
+boxes for other OSes.  The GNU/Hurd people have 
[[http://www.gnu.org/software/hurd/public_hurd_boxen.html][porter boxes]], and 
so do
+the [[http://www.opencsw.org/standards/build_farm][OpenCSW Solaris Team]] and 
the 
[[http://lists.gnu.org/archive/html/autoconf/2012-11/msg00039.html][Snakebite]] 
project.
 
 
 *** Post a pre-release announcement to address@hidden'
diff --git a/libguile/socket.c b/libguile/socket.c
index 2314377..5119ce3 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
- *   2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+ *   2006, 2007, 2009, 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 License
@@ -26,6 +26,7 @@
 
 #include <errno.h>
 #include <gmp.h>
+#include <verify.h>
 
 #include "libguile/_scm.h"
 #include "libguile/arrays.h"
@@ -742,6 +743,11 @@ SCM_DEFINE (scm_setsockopt, "setsockopt", 4, 0, 0,
 }
 #undef FUNC_NAME
 
+/* Our documentation hard-codes this mapping, so make sure it holds.  */
+verify (SHUT_RD == 0);
+verify (SHUT_WR == 1);
+verify (SHUT_RDWR == 2);
+
 SCM_DEFINE (scm_shutdown, "shutdown", 2, 0, 0,
           (SCM sock, SCM how),
            "Sockets can be closed simply by using @code{close-port}. The\n"
diff --git a/module/system/repl/common.scm b/module/system/repl/common.scm
index 346ba99..3f3e785 100644
--- a/module/system/repl/common.scm
+++ b/module/system/repl/common.scm
@@ -119,6 +119,11 @@ See <http://www.gnu.org/licenses/lgpl.html>, for more 
details.")
                     ((thunk? prompt) (lambda (repl) (prompt)))
                     ((procedure? prompt) prompt)
                     (else (error "Invalid prompt" prompt)))))
+     (print #f ,(lambda (print)
+                  (cond
+                   ((not print) #f)
+                   ((procedure? print) print)
+                   (else (error "Invalid print procedure" print)))))
      (value-history
       ,(value-history-enabled?)
       ,(lambda (x)
@@ -209,12 +214,16 @@ See <http://www.gnu.org/licenses/lgpl.html>, for more 
details.")
   (if (not (eq? val *unspecified*))
       (begin
         (run-hook before-print-hook val)
-        ;; The result of an evaluation is representable in scheme, and
-        ;; should be printed with the generic printer, `write'. The
-        ;; language-printer is something else: it prints expressions of
-        ;; a given language, not the result of evaluation.
-       (write val)
-       (newline))))
+        (cond
+         ((repl-option-ref repl 'print)
+          => (lambda (print) (print repl val)))
+         (else
+          ;; The result of an evaluation is representable in scheme, and
+          ;; should be printed with the generic printer, `write'. The
+          ;; language-printer is something else: it prints expressions of
+          ;; a given language, not the result of evaluation.
+          (write val)
+          (newline))))))
 
 (define (repl-option-ref repl key)
   (cadr (or (assq key (repl-options repl))
diff --git a/test-suite/tests/ftw.test b/test-suite/tests/ftw.test
index 2a203de..7cd88e4 100644
--- a/test-suite/tests/ftw.test
+++ b/test-suite/tests/ftw.test
@@ -214,18 +214,22 @@
       (equal? (file-system-fold enter? leaf down up skip error '() name)
               `((error ,name ,ENOENT)))))
 
-  (pass-if "EACCES"
-    (with-file-tree %top-builddir '(directory "test-EACCES" #o000
-                                              (("a") ("b")))
-      (let ((enter? (lambda (n s r) #t))
-            (leaf   (lambda (n s r) (cons `(leaf ,n) r)))
-            (down   (lambda (n s r) (cons `(down ,n) r)))
-            (up     (lambda (n s r) (cons `(up ,n) r)))
-            (skip   (lambda (n s r) (cons `(skip ,n) r)))
-            (error  (lambda (n s e r) (cons `(error ,n ,e) r)))
-            (name   (string-append %top-builddir "/test-EACCES")))
-        (equal? (file-system-fold enter? leaf down up skip error '() name)
-                `((error ,name ,EACCES))))))
+  (let ((name (string-append %top-builddir "/test-EACCES")))
+    (pass-if-equal "EACCES"
+        `((error ,name ,EACCES))
+      (if (zero? (getuid))
+          ;; When run as root, this test would fail because root can
+          ;; list the contents of #o000 directories.
+          (throw 'unresolved)
+          (with-file-tree %top-builddir '(directory "test-EACCES" #o000
+                                                    (("a") ("b")))
+            (let ((enter? (lambda (n s r) #t))
+                  (leaf   (lambda (n s r) (cons `(leaf ,n) r)))
+                  (down   (lambda (n s r) (cons `(down ,n) r)))
+                  (up     (lambda (n s r) (cons `(up ,n) r)))
+                  (skip   (lambda (n s r) (cons `(skip ,n) r)))
+                  (error  (lambda (n s e r) (cons `(error ,n ,e) r))))
+              (file-system-fold enter? leaf down up skip error '() name))))))
 
   (pass-if "dangling symlink and lstat"
     (with-file-tree %top-builddir '(directory "test-dangling"


hooks/post-receive
-- 
GNU Guile