@@ -1188,12 +1188,13 @@
 		(set! res #f))))    ;; overrides -no-cache switch
     res))
   
 ;; force use of server?
 ;;
+(define *common:local-force-server* #f)
 (define (common:force-server?)
-  (let* ((force-setting (configf:lookup *configdat* "server" "force"))
+  (let* ((force-setting (or *common:local-force-server* (configf:lookup *configdat* "server" "force")))
 	 (force-type    (if force-setting (string->symbol force-setting) #f))
 	 (force-result  (case force-type
 			  ((#f)     #f)
 			  ((always) #t)
 			  ((test)   (if (args:get-arg "-execute") ;; we are in a test