From xemacs-m  Fri Jun 27 01:18:14 1997
Received: from jagor.srce.hr (hniksic@jagor.srce.hr [161.53.2.130])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id BAA24557
	for <xemacs-beta@xemacs.org>; Fri, 27 Jun 1997 01:18:12 -0500 (CDT)
Received: (from hniksic@localhost)
          by jagor.srce.hr (8.8.5/8.8.4)
	  id IAA23522; Fri, 27 Jun 1997 08:18:11 +0200 (MET DST)
To: XEmacs Developers <xemacs-beta@xemacs.org>
Subject: Re: gnuclient crashage
References: <bcihgekbqnh.fsf@corp.Sun.COM> <m2soy4pro3.fsf@altair.xemacs.org> <kigg1u4d3py.fsf@jagor.srce.hr> <m2g1u4bnkj.fsf@altair.xemacs.org>
X-Attribution: Hrv
X-Face: Mie8:rOV<\c/~z{s.X4A{!?vY7{drJ([U]0O=W/<W*SMo/Mv:58:*_y~ki>xDi&N7XG
        KV^$k0m3Oe/)'e%3=$PCR&3ITUXH,cK>]bci&<qQ>Ff%x_>1`T(+M2Gg/fgndU%k*ft
        [(7._6e0n-V%|%'[c|q:;}td$#INd+;?!-V=c8Pqf}3J
From: Hrvoje Niksic <hniksic@srce.hr>
Date: 27 Jun 1997 08:18:11 +0200
In-Reply-To: Steven L Baur's message of "26 Jun 1997 22:51:40 -0700"
Message-ID: <kigen9od0ws.fsf@jagor.srce.hr>
Lines: 146
X-Mailer: Gnus v5.4.59/XEmacs 20.3(beta9) - "Sofia"

Steven L Baur <steve@xemacs.org> writes:

> Hrvoje Niksic <hniksic@srce.hr> writes:
> 
> > Does this fix it?
> 
>  ...
> > -;; Version: 3.5
> > +;; Version: 3.6
> 
> Whoops!  Did I miss a patch?  The version distributed with Sofia (and
> currently in the baseline) is 3.4.

Thar's why I like version numbers. :-)

--- gnuserv.el	Thu Jun 26 04:31:17 1997
+++ /home/srce/hniksic/site-lisp/gnuserv.el	Fri Jun 27 07:16:29 1997
@@ -1,7 +1,7 @@
 ;;; gnuserv.el --- Lisp interface code between Emacs and gnuserv
 ;; Copyright (C) 1989-1997 Free Software Foundation, Inc.
 
-;; Version: 3.4
+;; Version: 3.6
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com), originally based on server.el
 ;;         Hrvoje Niksic <hniksic@srce.hr>
 ;; Maintainer: Jan Vroonhof <vroonhof@math.ethz.ch>,
@@ -89,6 +89,32 @@
   :group 'terminals)
 
 
+
+;; Provide the old variables as aliases, to avoid breaking .emacs
+;; files.  However, they are obsolete and should be converted to the
+;; new forms.  This ugly crock must be before the variable
+;; declaration, or the scheme fails.
+
+(define-obsolete-variable-alias 'server-frame 'gnuserv-frame)
+(define-obsolete-variable-alias 'server-done-function
+  'gnuserv-done-function)
+(define-obsolete-variable-alias 'server-done-temp-file-function
+  'gnuserv-done-temp-file-function)
+(define-obsolete-variable-alias 'server-find-file-function
+  'gnuserv-find-file-function)
+(define-obsolete-variable-alias 'server-program
+  'gnuserv-program)
+(define-obsolete-variable-alias 'server-visit-hook
+  'gnuserv-visit-hook)
+(define-obsolete-variable-alias 'server-done-hook
+  'gnuserv-done-hook)
+(define-obsolete-variable-alias 'server-kill-quietly
+  'gnuserv-kill-quietly)
+(define-obsolete-variable-alias 'server-temp-file-regexp
+  'gnuserv-temp-file-regexp)
+(define-obsolete-variable-alias 'server-make-temp-file-backup
+  'gnuserv-make-temp-file-backup)
+
 ;;;###autoload
 (defcustom gnuserv-frame nil
   "*The frame to be used to display all edited files.
@@ -184,29 +210,6 @@
   :group 'gnuserv)
 
 
-;; The old functions are provided as aliases, to avoid breaking .emacs
-;; files.  However, they are obsolete and should be avoided.
-
-(define-obsolete-variable-alias 'server-frame 'gnuserv-frame)
-(define-obsolete-variable-alias 'server-done-function 'gnuserv-done-function)
-(define-obsolete-variable-alias 'server-done-temp-file-function
-  'gnuserv-done-temp-file-function)
-(define-obsolete-variable-alias 'server-find-file-function
-  'gnuserv-find-file-function)
-(define-obsolete-variable-alias 'server-program
-  'gnuserv-program)
-(define-obsolete-variable-alias 'server-visit-hook
-  'gnuserv-visit-hook)
-(define-obsolete-variable-alias 'server-done-hook
-  'gnuserv-done-hook)
-(define-obsolete-variable-alias 'server-kill-quietly
-  'gnuserv-kill-quietly)
-(define-obsolete-variable-alias 'server-temp-file-regexp
-  'gnuserv-temp-file-regexp)
-(define-obsolete-variable-alias 'server-make-temp-file-backup
-  'gnuserv-make-temp-file-backup)
-
-
 ;;; Internal variables:
 
 (defstruct gnuclient
@@ -288,21 +291,17 @@
 ;; We used to restart the server here, but it's too risky -- if
 ;; something goes awry, it's too easy to wind up in a loop.
 (defun gnuserv-sentinel (proc msg)
+  (let ((msgstring (concat "Gnuserv process %s; restart with `%s'"))
+	(keystring (substitute-command-keys "\\[gnuserv-start]")))
   (case (process-status proc)
     (exit
-     (message
-      (substitute-command-keys
-       "Gnuserv subprocess exited; restart with `\\[gnuserv-start]'"))
+     (message msgstring "exited" keystring)
      (gnuserv-prepare-shutdown))
     (signal
-     (message
-      (substitute-command-keys
-       "Gnuserv subprocess killed; restart with `\\[gnuserv-start]'"))
+     (message msgstring "killed" keystring)
      (gnuserv-prepare-shutdown))
     (closed
-     (message
-      (substitute-command-keys
-       "Gnuserv subprocess closed; restart with `\\[gnuserv-start]'"))
+     (message msgstring "closed" keystring))
      (gnuserv-prepare-shutdown))))
 
 ;; This function reads client requests from our current server.  Every
@@ -466,10 +465,12 @@
 	;; `gnuserv-edit'.
 	(if (and (not (or quick view))
 		 (gnuclient-buffers client))
-	    (message (substitute-command-keys
+	    (message "%s"
+		     (substitute-command-keys
 		      "Type `\\[gnuserv-edit]' to finish editing"))
 	  (or dest-frame
-	      (message (substitute-command-keys
+	      (message "%s"
+		       (substitute-command-keys
 			"Type `\\[delete-frame]' to finish editing")))))))))
 
 
@@ -543,7 +544,7 @@
 	;; we must make sure that the server kill doesn't result in
 	;; killing the device, because it would cause a device-dead
 	;; error when `delete-device' tries to do the job later.
-	(gnuserv-kill-client (car client) t))))
+	(gnuserv-kill-client client t))))
   (callf2 delq device gnuserv-devices))
 
 (add-hook 'delete-device-hook 'gnuserv-check-device)


-- 
Hrvoje Niksic <hniksic@srce.hr> | Student at FER Zagreb, Croatia
--------------------------------+--------------------------------
I'm sure they'll listen to reason! -- Neal Stevenson, _Snow Crash_

