r11206: check reader syntax functions stored before trying to restore them.

diff --git a/ChangeLog b/ChangeLog
index 3e0228030acff7e1b69eb262d8db217d16e4d886..4fdb45fe565358e2cbcf8a18d602b3d3eed940d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+02 Oct 2006  Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/syntax.lisp: Check that original reader syntax functions
+       stored before trying to restore them.
+       
 20 Sep 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * sql/syntax.lisp: Apply patch from Marcus Pearce to correctly
        display sql reader syntax.

diff --git a/debian/changelog b/debian/changelog
index f5ce9941a41b9870088c2a360c3bb7d9dd0f8e17..5790452ac4e1f999ba1d24718eb43c42e02db597 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+cl-sql (3.7.3-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 02 Oct 2006 23:05:55 -0600
+
 cl-sql (3.7.2-1) unstable; urgency=low
 
-  * New ustream
+  * New upstream
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 20 Sep 2006 21:24:22 -0600
 

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index be92ab507be713519597a9ffd9a93562ae7c6fca..c0e8487ba1edc355e78303ff8260cad0d17143c7 100644 (file)
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -45,8 +45,10 @@ the current syntax state."
     (%disable-sql-reader-syntax)))
 
 (defun %disable-sql-reader-syntax ()
-  (set-macro-character *sql-macro-open-char* *original-reader-enter*)
-  (set-macro-character *sql-macro-close-char* *original-reader-exit*)
+  (when *original-reader-enter*
+    (set-macro-character *sql-macro-open-char* *original-reader-enter*))
+  (when *original-reader-exit*
+    (set-macro-character *sql-macro-close-char* *original-reader-exit*))
   (values))