mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 06:50:31 +02:00
Code Activity

Merge commit '40a723a922'

Browse source
This commit is contained in:
Andy Wingo 2014-02-07 15:26:18 +01:00
commit 7affd3141b
3 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/ref/guile-invoke.texi
View file

@ -410,14 +410,6 @@ Guile uses the environment variable @env{HOME}, the name of your home
directory, to locate various files, such as @file{.guile} or directory, to locate various files, such as @file{.guile} or
@file{.guile_history}. @file{.guile_history}.
@item LTDL_LIBRARY_PATH
@vindex LTDL_LIBRARY_PATH
Guile now adds its install prefix to the @env{LTDL_LIBRARY_PATH}.
Users may now install Guile in non-standard directories and run
`/path/to/bin/guile', without having also to set @env{LTDL_LIBRARY_PATH}
to include `/path/to/lib'.
@end table @end table
@c Local Variables: @c Local Variables:

8
doc/ref/r6rs.texi
View file

@ -1,7 +1,7 @@
@c -*-texinfo-*- @c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual. @c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 2010, 2011, 2012, 2013 @c Copyright (C) 2010, 2011, 2012, 2013,
@c Free Software Foundation, Inc. @c 2014 Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions. @c See the file guile.texi for copying conditions.
@node R6RS Support @node R6RS Support
@ -100,6 +100,10 @@ ongoing to fix this.
Guile does not prevent use of textual I/O procedures on binary ports. Guile does not prevent use of textual I/O procedures on binary ports.
More generally, it does not make a sharp distinction between binary and More generally, it does not make a sharp distinction between binary and
textual ports (@pxref{R6RS Port Manipulation, binary-port?}). textual ports (@pxref{R6RS Port Manipulation, binary-port?}).
@item
Guile's implementation of @code{equal?} may fail to terminate when
applied to arguments containing cycles.
@end itemize @end itemize
@node R6RS Standard Libraries @node R6RS Standard Libraries

20
module/system/repl/server.scm
View file

@ -1,6 +1,6 @@
;;; Repl server ;;; Repl server
;; Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc. ;; Copyright (C) 2003, 2010, 2011, 2014 Free Software Foundation, Inc.
;; This library is free software; you can redistribute it and/or ;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public ;; modify it under the terms of the GNU Lesser General Public
@ -76,10 +76,6 @@
((port-closed? server-socket) ((port-closed? server-socket)
;; Shutting down. ;; Shutting down.
#f) #f)
((eq? k 'interrupt)
;; Interrupt.
(close-socket! server-socket)
#f)
(else (else
(warn "Error accepting client" k args) (warn "Error accepting client" k args)
;; Retry after a timeout. ;; Retry after a timeout.
@ -104,12 +100,10 @@
(define (serve-client client addr) (define (serve-client client addr)
(with-continuation-barrier (with-continuation-barrier
(lambda () (lambda ()
(with-input-from-port client (parameterize ((current-input-port client)
(lambda () (current-output-port client)
(with-output-to-port client (current-error-port client)
(lambda () (current-warning-port client))
(with-error-to-port client (with-fluids ((*repl-stack* '()))
(lambda () (start-repl)))))
(with-fluids ((*repl-stack* '()))
(start-repl))))))))))
(close-socket! client)) (close-socket! client))