changeset 4868:0dd76c7b7846

Merge.
author Mike Sperber <sperber@deinprogramm.de>
date Mon, 18 Jan 2010 08:48:09 +0100
parents 7822019c5d98 (current diff) 8b7644c73fd2 (diff)
children e533a9912ef1
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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):
--- 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)