Fix handling of the FLAGS argument in `fold-matches'.

* ice-9/regex.scm (fold-matches): If FLAGS is non-null, use
  `(car flags)', not `flags'.

* test-suite/tests/regexp.test ("fold-matches"): New test prefix.

* NEWS: Update.

1 files changed, 24 insertions, 1 deletions

diff --git a/test-suite/tests/regexp.test b/test-suite/tests/regexp.test
index 3050af39b..0ca0203b6 100644
--- a/test-suite/tests/regexp.test
+++ b/test-suite/tests/regexp.test
@@ -1,7 +1,7 @@
 ;;;; regexp.test --- test Guile's regular expression functions -*- scheme -*-
 ;;;; Jim Blandy <jimb@red-bean.com> --- September 1999
 ;;;;
-;;;; 	Copyright (C) 1999, 2004, 2006, 2007 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 1999, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -103,6 +103,29 @@
       (regexp-exec re "aaaabbbb" 0 'bogus-flags-arg))))      
 
 ;;;
+;;; fold-matches
+;;;
+
+(with-test-prefix "fold-matches"
+
+  (pass-if "without flags"
+    (equal? '("hello")
+            (fold-matches "^[a-z]+$" "hello" '()
+                          (lambda (match result)
+                            (cons (match:substring match)
+                                  result)))))
+
+  (pass-if "with flags"
+    ;; Prior to 1.8.6, passing an additional flag would not work.
+    (null?
+     (fold-matches "^[a-z]+$" "hello" '()
+                   (lambda (match result)
+                     (cons (match:substring match)
+                           result))
+                   (logior regexp/notbol regexp/noteol)))))
+
+
+;;;
 ;;; regexp-quote
 ;;;