[sawfish] Fix compilation error, possibly due to multi-threaded compiles.

[Jeremy Hankins <jjhankins src gnome org>]

commit 54999c0353cb48a7c2051c98dc2c57df7a56a4ad
Author: Jeremy Hankins <nowan nowan org>
Date:   Fri May 28 09:40:58 2010 -0500

    Fix compilation error, possibly due to multi-threaded compiles.

 ChangeLog                      |    4 ++++
 lisp/sawfish/wm/util/prompt.jl |   16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bf6aec2..cb28800 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-28  Jeremy Hankins <nowan nowan org>
+	* lisp/sawfish/wm/util/prompt.jl: Fix compilation error
+	                 -- [Harald van Dijk]
+
 2010-05-23  Christopher Roy Bratusek <zanghar freenet de>
 	* man/sawfish.texi
 	* src/events.c
diff --git a/lisp/sawfish/wm/util/prompt.jl b/lisp/sawfish/wm/util/prompt.jl
index db436fd..ccbbe85 100644
--- a/lisp/sawfish/wm/util/prompt.jl
+++ b/lisp/sawfish/wm/util/prompt.jl
@@ -57,8 +57,7 @@
 	  sawfish.wm.events
 	  sawfish.wm.custom
 	  sawfish.wm.commands
-	  sawfish.wm.fonts
-	  sawfish.wm.util.prompt)
+	  sawfish.wm.fonts)
 
   (defgroup messages "Messages" :group misc)
 
@@ -122,10 +121,15 @@ displayed. See the `display-message' function for more details.")
   ;; Compilation hack: ensure that the compiler doesn't complain when
   ;; these are treated like functions and passed values.
   (eval-when-compile
-    (setq prompt-completion-fun (lambda (#!rest) nil)
-          prompt-validation-fun (lambda (#!rest) nil)
-          prompt-abbrev-fun (lambda (#!rest) nil)
-          prompt-display-fun (lambda (#!rest) nil)))
+    (progn
+      (defvar prompt-completion-fun nil)
+      (defvar prompt-validation-fun nil)
+      (defvar prompt-abbrev-fun nil)
+      (defvar prompt-display-fun nil)
+      (setq prompt-completion-fun (lambda (#!rest) nil)
+            prompt-validation-fun (lambda (#!rest) nil)
+            prompt-abbrev-fun (lambda (#!rest) nil)
+            prompt-display-fun (lambda (#!rest) nil))))
 
 
   ;; From merlin