# HG changeset patch
# User Mike Sperber <sperber@deinprogramm.de>
# Date 1263800889 -3600
# Node ID 0dd76c7b78464157161eca47049933c239c06434
# Parent  7822019c5d98aba05da483786cc0fae4f1f68bb3# Parent  8b7644c73fd222c899d0536465c3f1e11cd927f1
Merge.

diff -r 7822019c5d98 -r 0dd76c7b7846 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 17 22:08:56 2010 -0500
+++ b/lisp/ChangeLog	Mon Jan 18 08:48:09 2010 +0100
@@ -108,6 +108,11 @@
 	Remove support in our generated code for emacs versions where
 	keywords are not self-quoting.
 
+2009-12-21  Michael Sperber  <mike@xemacs.org>
+
+	* gnuserv.el (gnuserv-program): Specifically look for gnuserv in
+	`exec-directory'.
+
 2009-12-18  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* alist.el (modify-alist):
diff -r 7822019c5d98 -r 0dd76c7b7846 lisp/gnuserv.el
--- a/lisp/gnuserv.el	Sun Jan 17 22:08:56 2010 -0500
+++ b/lisp/gnuserv.el	Mon Jan 18 08:48:09 2010 +0100
@@ -181,7 +181,7 @@
 		(function :tag "Other"))
   :group 'gnuserv)
 
-(defcustom gnuserv-program "gnuserv"
+(defcustom gnuserv-program (expand-file-name "gnuserv" exec-directory)
   "*Program to use as the editing server."
   :type 'string
   :group 'gnuserv)