Import Debian changes 2c7-1debian/2c7-1

slib (2c7-1) unstable; urgency=low

  * New upstream.
  * Add slibconfig back in.

slib (2c6-2) unstable; urgency=low

  * Remove the slib$(VERSION).info file.  Cut the diff back down to
    size. 

slib (2c6-1) unstable; urgency=low

  * New upstream.
  * Move docs to /usr/share. Up standards version. add /usr/doc symlink.
    Move info files.  Remove undocumented link.

slib (2c5-6) unstable; urgency=low

  * Lowercase two vars in yasyn.scm (Fixes bug #37222)

slib (2c5-5) unstable; urgency=low

  * Fix it so string-index isn't defined (now there is a
    strsrch:string-index) (Fixes #38812)

slib (2c5-4) unstable; urgency=low

  * Don't run slibconfig in postinst.  (Fixes bug #38253, #37733, #37715,
    #37746,  #37809, #37917, #38123, #38462)

slib (2c5-3) unstable; urgency=low

  * Run slibconfig in postinst.  It was commented out there, but I don't
    see any old bug reports on why it was commented out, so let's try
    again. :)  (Fixes bug #37221)

slib (2c5-2) unstable; urgency=low

  * Link mklibcat.scm to mklibcat.  Fixes a problem with using slib with
    guile. 

slib (2c5-1) unstable; urgency=low

  * New upstream.

slib (2c3-4) unstable; urgency=low

  * New maintainer.

1 files changed, 11 insertions, 8 deletions

diff --git a/strsrch.scm b/strsrch.scm
index 68bcf0e..a6ab7e1 100644
--- a/strsrch.scm
+++ b/strsrch.scm
@@ -5,7 +5,7 @@
 ; This code is in the public domain.
 
 ;;; Return the index of the first occurence of a-char in str, or #f
-(define (string-index str a-char)
+(define (strsrch:string-index str a-char)
   (let loop ((pos 0))
     (cond
      ;; whole string has been searched, in vain
@@ -40,7 +40,7 @@
 	 (c2 (if (<= pat-len 1) #f (string-ref pattern 1))))
     (cond
      ((not c1) 0)			; empty pattern, matches upfront
-     ((not c2) (string-index str c1))	; one-char pattern
+     ((not c2) (strsrch:string-index str c1))	; one-char pattern
      (else				; matching pattern of > two chars
       (let outer ((pos 0))
 	(cond
@@ -66,16 +66,19 @@
   (set! max-no-char (if (null? max-no-char) #f (car max-no-char)))
   (letrec
       ((no-chars-read 0)
+       (peeked? #f)
        (my-peek-char			; Return a peeked char or #f
 	(lambda () (and (or (not (number? max-no-char))
 			    (< no-chars-read max-no-char))
 			(let ((c (peek-char <input-port>)))
-			  (and (not (eof-object? c))
-			       (if (procedure? max-no-char)
-				   (not (max-no-char c))
-				   (not (eqv? max-no-char c)))
-			       c)))))
-       (next-char (lambda () (read-char <input-port>)
+			  (cond (peeked? c)
+				((eof-object? c) #f)
+				((procedure? max-no-char)
+				 (set! peeked? #t)
+				 (if (max-no-char c) #f c))
+				((eqv? max-no-char c) #f)
+				(else c))))))
+       (next-char (lambda () (set! peeked? #f) (read-char <input-port>)
 			  (set! no-chars-read  (+ 1 no-chars-read))))
        (match-1st-char			; of the string str
 	(lambda ()