[Guile-commits] 18/19: Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c'

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 0a5b437ef9063df2a3728338a7cd6b86c4c2e275
Merge: e19235e ed72201
Author: Andy Wingo <address@hidden>
Date:   Thu Jan 22 14:53:06 2015 +0100

    Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c'
    
    Conflicts:
        test-suite/tests/r6rs-ports.test

 libguile/r6rs-ports.c            |   17 ++++++++++-------
 module/ice-9/command-line.scm    |   12 +++++++-----
 test-suite/tests/r6rs-ports.test |   34 ++++++++++++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --cc test-suite/tests/r6rs-ports.test
index 17acdc4,e5f1266..dd40925
--- a/test-suite/tests/r6rs-ports.test
+++ b/test-suite/tests/r6rs-ports.test
@@@ -1,7 -1,6 +1,6 @@@
  ;;;; r6rs-ports.test --- R6RS I/O port tests.   -*- coding: utf-8; -*-
  ;;;;
- ;;;; Copyright (C) 2009, 2010, 2011, 2012, 2013,
- ;;;;   2014 Free Software Foundation, Inc.
 -;;;; Copyright (C) 2009-2012, 2014-2015 Free Software Foundation, Inc.
++;;;; Copyright (C) 2009-2012, 2013-2015 Free Software Foundation, Inc.
  ;;;; Ludovic Courtès
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or