XEmacs 21.2.25 "Hephaestus".

[chise/xemacs-chise.git.1] / lisp / gnuserv.el

diff --git a/lisp/gnuserv.el b/lisp/gnuserv.el
index ee47e85..04bf42a 100644 (file)
--- a/lisp/gnuserv.el
+++ b/lisp/gnuserv.el
@@ -3,9 +3,9 @@
 
 ;; Version: 3.11
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com), originally based on server.el
-;;         Hrvoje Niksic <hniksic@srce.hr>
+;;         Hrvoje Niksic <hniksic@xemacs.org>
 ;; Maintainer: Jan Vroonhof <vroonhof@math.ethz.ch>,
-;;             Hrvoje Niksic <hniksic@srce.hr>
+;;             Hrvoje Niksic <hniksic@xemacs.org>
 ;; Keywords: environment, processes, terminals
 
 ;; This file is part of XEmacs.
@@ -73,7 +73,7 @@
 ;; Jan Vroonhof
 ;;     Customized.
 ;;
-;; Hrvoje Niksic <hniksic@srce.hr> May/1997
+;; Hrvoje Niksic <hniksic@xemacs.org> May/1997
 ;;     Completely rewritten.  Now uses `defstruct' and other CL stuff
 ;;     to define clients cleanly.  Many thanks to Dave Gillespie!
 ;;
@@ -348,11 +348,13 @@ visual screen.  Totally visible frames are preferred.  If none found, return nil
               ;; In case of an error, write the description to the
               ;; client, and then signal it.
               (error (setq gnuserv-string "")
-                     (gnuserv-write-to-client gnuserv-current-client oops)
+                     (when gnuserv-current-client
+                       (gnuserv-write-to-client gnuserv-current-client oops))
                      (setq gnuserv-current-client nil)
                      (signal (car oops) (cdr oops)))
               (quit (setq gnuserv-string "")
-                    (gnuserv-write-to-client gnuserv-current-client oops)
+                    (when gnuserv-current-client
+                      (gnuserv-write-to-client gnuserv-current-client oops))
                     (setq gnuserv-current-client nil)
                     (signal 'quit nil)))
             (setq gnuserv-string "")))