[cl-l10n-cvs] CVS cl-l10n

[alendvai]

Update of /project/cl-l10n/cvsroot/cl-l10n
In directory clnet:/tmp/cvs-serv26914

Modified Files:
	i18n.lisp load-locale.lisp 
Log Message:
Some fixes


--- /project/cl-l10n/cvsroot/cl-l10n/i18n.lisp	2006/06/15 19:57:34	1.6
+++ /project/cl-l10n/cvsroot/cl-l10n/i18n.lisp	2006/06/15 22:56:18	1.7
@@ -106,12 +106,12 @@
         (finally (return (with-unique-names (block fallback-tmp)
                            `(block ,block
                              (let ((,fallback-tmp ,fallback))
-                               (bind (((values resource foundp) (lookup-resource
-                                                                 ,fallback-tmp nil :warn-if-missing nil :fallback-to-name nil)))
+                               (multiple-value-bind (resource foundp)
+                                   (lookup-resource ,fallback-tmp nil :warn-if-missing nil :fallback-to-name nil)
                                  (when foundp
                                    (return-from ,block (values resource t))))
                                ,@(iter (for lookup in lookups)
-                                       (collect `(bind (((values resource foundp) ,lookup))
+                                       (collect `(multiple-value-bind (resource foundp) ,lookup
                                                   (when foundp
                                                     (return-from ,block (values resource t))))))
                                (return-from ,block (values ,fallback-tmp nil)))))))))
--- /project/cl-l10n/cvsroot/cl-l10n/load-locale.lisp	2006/06/15 19:57:34	1.18
+++ /project/cl-l10n/cvsroot/cl-l10n/load-locale.lisp	2006/06/15 22:56:18	1.19
@@ -400,8 +400,11 @@
                      (locale locale-des))))
 
 (defmacro with-locale (locale &body body)
-  `(let ((*locale* (locale ,locale)))
-    , at body))
+  (rebinding (locale)
+    `(let ((*locale* (if (consp ,locale)
+                         ,locale
+                         (locale ,locale))))
+      , at body)))
 
 (defun load-default-locale ()
   (set-locale (get-default-locale)))