--- a/lisp/gnuserv.el	Mon Aug 13 10:23:52 2007 +0200
+++ b/lisp/gnuserv.el	Mon Aug 13 10:24:41 2007 +0200
@@ -205,7 +205,8 @@
   :type 'boolean
   :group 'gnuserv)
 
-(defcustom gnuserv-temp-file-regexp "^/tmp/Re\\|/draft$"
+(defcustom gnuserv-temp-file-regexp
+  (concat "^" (temp-directory) "/Re\\|/draft$")
   "*Regexp which should match filenames of temporary files deleted
 and reused by the programs that invoke the Emacs server."
   :type 'regexp
@@ -459,7 +460,7 @@
 	    ;; Add the "Done" button to the menubar, only in this buffer.
 	    (if (and (featurep 'menubar) current-menubar)
 	      (progn (set-buffer-menubar current-menubar)
-	      (add-menu-button nil ["Done" gnuserv-edit t]))
+	      (add-menu-button nil ["Done" gnuserv-edit]))
 	      ))
 	  (run-hooks 'gnuserv-visit-hook)
 	  (pop list)))