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

[Jeremy Hankins <nowan nowan org>]

Harald van Dijk <harald gigawatt nl> writes:

> Including the defvar in eval-when-compile is a good idea, and that
> works. Naively trying what you suggested I see the problem you're
> seeing too, but that's easily fixed: just make sure they're in a
> progn: eval-when-compile only takes a single argument.

Ah, that explains it!  Thanks.

This patch doesn't generate any warnings or errors for me.

> 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

-- 
Jeremy Hankins <nowan nowan org>