sawfish 1.6.3 can't compile sawfish.wm.util.prompt

[Harald van Dijk <harald gigawatt nl>]

[...]
(compiling sawfish/wm/util/ping.jl)
(compiling sawfish/wm/util/prompt.jl)
error--> (void-value prompt-completion-fun)
make[1]: *** [lisp] Error 10
make[1]: Leaving directory `/home/harald/sawfish/lisp'
make: *** [all] Error 1

This file is unchanged from 1.6.2, but as of commit 
2277ff2ca26ea48fd6ce96f45faa4971a52bc81a 
<http://git.gnome.org/browse/sawfish/commit/?id=2277ff2ca26ea48fd6ce96f45faa4971a52bc81a>, 
sawfish.wm.util.prompt is no longer implicitly included when compiling 
itself. Note that you will not see this error if you are working from a 
previous build directory where the .jlc files already exist. I noticed 
the build completes without errors or warnings if I simply remove the 
"Compilation hack" block; is it still necessary? If it is necessary, 
another way to fix the problem is by having sawfish.wm.util.prompt 
explicitly (open) itself.

In patch form, both suggestions combined would be

diff --git a/lisp/sawfish/wm/util/prompt.jl b/lisp/sawfish/wm/util/prompt.jl
index 96906f5..805cbf0 100644
--- a/lisp/sawfish/wm/util/prompt.jl
+++ b/lisp/sawfish/wm/util/prompt.jl
@@ -57,7 +57,8 @@
          sawfish.wm.events
          sawfish.wm.custom
          sawfish.wm.commands
-         sawfish.wm.fonts)
+         sawfish.wm.fonts
+         sawfish.wm.util.prompt)

   (defgroup messages "Messages" :group misc)

@@ -118,15 +119,6 @@ displayed. See the `display-message' function for 
more details.")
   (defvar prompt-saved nil)
   (defvar prompt-attr nil)

-  ;; 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)))
-
-
   ;; From merlin
   ;; But maybe better if we'd include this util?


but only one should be applied, of course.