X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnuserv.el;h=04bf42aceca382bb2aaed36269d3961540f8c975;hb=6055f790006272b9f8497e9dc6240771220196a1;hp=7b89699bfa0a330ebb68353063aa7334b9fd692b;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/lisp/gnuserv.el b/lisp/gnuserv.el
index 7b89699..04bf42a 100644
--- 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.
@@ -68,12 +68,12 @@
 ;; ported the server-temp-file-regexp feature from server.el
 ;; ported server hooks from server.el
 ;; ported kill-*-query functions from server.el (and made it optional)
-;; synced other behaviour with server.el
+;; synced other behavior with server.el
 ;;
 ;; 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 "")))
@@ -440,6 +442,7 @@ If a flag is `view', view the files read-only."
 	   (client (make-gnuclient :id gnuserv-current-client
 				   :device device
 				   :frame new-frame)))
+      (select-frame frame)
       (setq gnuserv-current-client nil)
       ;; If the device was created by this client, push it to the list.
       (and (/= old-device-num (length (device-list)))