Import Debian changes 3a3-1debian/3a3-1

slib (3a3-1) unstable; urgency=low

  * New upstream release.  Change to guile.init for module correctness
    (from 3a2-5) is now in upstream.  We'll drop the path-search
    misfeature at this point, and stick to upstream's version, unless this
    causes actual difficulties.
  * Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1.
  
  * debian/postinst: Fix typos in comments.  (Closes: #337571)

1 files changed, 15 insertions, 20 deletions

diff --git a/guile.init b/guile.init
index 9fd36d9..76f1f0e 100644
--- a/guile.init
+++ b/guile.init
@@ -370,26 +370,21 @@
 ;;;   (let ((load-file (guile:wrap-case-insensitive load)))
 ;;;     (lambda (<pathname>)
 ;;;       (load-file (string-append <pathname> (scheme-file-suffix))))))
-;; Two changes from the normal slib thing here:
-;;  1. Load from the path
-;;  2. Importantly: guarantee that loaded files land in the slib module.
-(define (slib:load name)
-  (save-module-excursion
-   (lambda ()
-     (set-current-module slib-module)
-     (let ((errinfo (catch 'system-error
-			   (lambda ()
-			     (load-from-path name)
-			     #f)
-			   (lambda args args))))
-       (if (and errinfo
-		(catch 'system-error
-		       (lambda ()
-			 (load-from-path
-			  (string-append name ".scm"))
-			 #f)
-		       (lambda args args)))
-	   (apply throw errinfo))))))
+(define (slib:load-helper loader)
+  (lambda (name)
+    (save-module-excursion
+     (lambda ()
+       (set-current-module slib-module)
+       (let ((errinfo (catch 'system-error
+			     (lambda () (loader name) #f)
+			     (lambda args args))))
+	 (if (and errinfo
+		  (catch 'system-error
+			 (lambda () (loader (string-append name ".scm")) #f)
+			 (lambda args args)))
+	     (apply throw errinfo)))))))
+(define slib:load (slib:load-helper load))
+(define slib:load-from-path (slib:load-helper load-from-path))
 
 (define slib:load-source slib:load)