X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnuserv.el;h=01128a97d675636f895fd186439054dbd6628aff;hb=bbfed888cf9e3be7b600cc20225a378880329cd5;hp=8da403ca5f9c1a023e8e43761fc0702ed093a355;hpb=376658ea71d16dced8acff36c3e385ac3738d868;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/gnuserv.el b/lisp/gnuserv.el
index 8da403c..01128a9 100644
--- a/lisp/gnuserv.el
+++ b/lisp/gnuserv.el
@@ -1,7 +1,7 @@
 ;;; gnuserv.el --- Lisp interface code between Emacs and gnuserv
 ;; Copyright (C) 1989-1997 Free Software Foundation, Inc.
 
-;; Version: 3.11
+;; Version: 3.12
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com), originally based on server.el
 ;;         Hrvoje Niksic <hniksic@xemacs.org>
 ;; Maintainer: Jan Vroonhof <vroonhof@math.ethz.ch>,
@@ -337,8 +337,8 @@ visual screen.  Totally visible frames are preferred.  If none found, return nil
   "Process gnuserv client requests to execute Emacs commands."
   (setq gnuserv-string (concat gnuserv-string string))
   ;; C-d means end of request.
-  (when (string-match "\C-d\\'" gnuserv-string)
-    (cond ((string-match "^[0-9]+" gnuserv-string) ; client request id
+  (when (string-match "\C-d\n?\\'" gnuserv-string)
+    (cond ((string-match "\\`[0-9]+" gnuserv-string) ; client request id
 	   (let ((header (read-from-string gnuserv-string)))
 	     ;; Set the client we are talking to.
 	     (setq gnuserv-current-client (car header))
@@ -348,17 +348,20 @@ 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 "")))
 	  (t
-	   (error "%s: invalid response from gnuserv" gnuserv-string)
-	   (setq gnuserv-string "")))))
+	   (let ((response (car (split-string gnuserv-string "\C-d"))))
+	     (setq gnuserv-string "")
+	     (error "%s: invalid response from gnuserv" response))))))
 
 ;; This function is somewhat of a misnomer.  Actually, we write to the
 ;; server (using `process-send-string' to gnuserv-process), which