Author: ulm
Date: 2009-01-21 06:20:38 +0000 (Wed, 21 Jan 2009)
New Revision: 1224

Modified:
   emacs-daemon/ChangeLog
   emacs-daemon/README
   emacs-daemon/emacs.conf
   emacs-daemon/emacs.rc
Log:
Include --daemon option in EMACS_OPTS variable. Other minor changes.

Modified: emacs-daemon/ChangeLog
===================================================================
--- emacs-daemon/ChangeLog	2009-01-19 17:23:39 UTC (rev 1223)
+++ emacs-daemon/ChangeLog	2009-01-21 06:20:38 UTC (rev 1224)
@@ -1,3 +1,9 @@
+2009-01-21  Ulrich Mueller  <ulm@g.o>
+
+	* emacs.rc: Use different syntax for assignment of default values.
+	(EMACS_OPTS, start): Include --daemon option in variable.
+	* emacs.conf (EMACS_OPTS): Document the above.
+
 2009-01-14  Ulrich Mueller  <ulm@g.o>
 
 	* Version 0.11 released.

Modified: emacs-daemon/README
===================================================================
--- emacs-daemon/README	2009-01-19 17:23:39 UTC (rev 1223)
+++ emacs-daemon/README	2009-01-21 06:20:38 UTC (rev 1224)
@@ -10,7 +10,8 @@
 Every user who wants to connect to an Emacs server must have an own
 instance of the daemonized GNU Emacs.  The init script automatically
 determines the user by its name, so you create a symbolic link (do
-not copy the script!) in your /etc/init.d directory:
+not copy the script, or you will miss eventual updates!) in your
+/etc/init.d directory:
 
 	ln -s emacs /etc/init.d/emacs.<username>
 

Modified: emacs-daemon/emacs.conf
===================================================================
--- emacs-daemon/emacs.conf	2009-01-19 17:23:39 UTC (rev 1223)
+++ emacs-daemon/emacs.conf	2009-01-21 06:20:38 UTC (rev 1224)
@@ -18,8 +18,8 @@
 # Timeout (in seconds) to wait for the daemon to detach
 #EMACS_TIMEOUT="30"
 
-# Any additional options to pass to emacs --daemon
-#EMACS_OPTS=""
+# Options to pass to Emacs. Don't remove "--daemon".
+#EMACS_OPTS="--daemon"
 
 # The SHELL variable to be passed to EMACS_START. emacs-wrapper.sh uses
 # this as the user's login shell. If (explicitely set to) empty, then

Modified: emacs-daemon/emacs.rc
===================================================================
--- emacs-daemon/emacs.rc	2009-01-19 17:23:39 UTC (rev 1223)
+++ emacs-daemon/emacs.rc	2009-01-21 06:20:38 UTC (rev 1224)
@@ -3,9 +3,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EMACS=${EMACS:-/usr/bin/emacs}
-EMACS_START=${EMACS_START:-/usr/libexec/emacs/emacs-wrapper.sh}
-EMACS_TIMEOUT=${EMACS_TIMEOUT:-30}
+: ${EMACS:=/usr/bin/emacs}
+: ${EMACS_OPTS:=--daemon}
+: ${EMACS_START:=/usr/libexec/emacs/emacs-wrapper.sh}
+: ${EMACS_TIMEOUT:=30}
 USER=${RC_SVCNAME#*.}
 PIDFILE_DIR=/var/run/emacs/${USER}
 PIDFILE=${PIDFILE_DIR}/emacs.pid
@@ -53,7 +54,7 @@
     start-stop-daemon --start \
 	--user "${USER}" --chdir "${home}" --pidfile "${PIDFILE}" \
 	--env EMACS="${EMACS}" --env EMACS_TIMEOUT="${EMACS_TIMEOUT}" \
-	--exec "${EMACS_START}" -- --daemon ${EMACS_OPTS}
+	--exec "${EMACS_START}" -- ${EMACS_OPTS}
     eend $?
 }