| 1 |
Author: ulm |
| 2 |
Date: 2009-01-21 06:20:38 +0000 (Wed, 21 Jan 2009) |
| 3 |
New Revision: 1224 |
| 4 |
|
| 5 |
Modified: |
| 6 |
emacs-daemon/ChangeLog |
| 7 |
emacs-daemon/README |
| 8 |
emacs-daemon/emacs.conf |
| 9 |
emacs-daemon/emacs.rc |
| 10 |
Log: |
| 11 |
Include --daemon option in EMACS_OPTS variable. Other minor changes. |
| 12 |
|
| 13 |
Modified: emacs-daemon/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- emacs-daemon/ChangeLog 2009-01-19 17:23:39 UTC (rev 1223) |
| 16 |
+++ emacs-daemon/ChangeLog 2009-01-21 06:20:38 UTC (rev 1224) |
| 17 |
@@ -1,3 +1,9 @@ |
| 18 |
+2009-01-21 Ulrich Mueller <ulm@g.o> |
| 19 |
+ |
| 20 |
+ * emacs.rc: Use different syntax for assignment of default values. |
| 21 |
+ (EMACS_OPTS, start): Include --daemon option in variable. |
| 22 |
+ * emacs.conf (EMACS_OPTS): Document the above. |
| 23 |
+ |
| 24 |
2009-01-14 Ulrich Mueller <ulm@g.o> |
| 25 |
|
| 26 |
* Version 0.11 released. |
| 27 |
|
| 28 |
Modified: emacs-daemon/README |
| 29 |
=================================================================== |
| 30 |
--- emacs-daemon/README 2009-01-19 17:23:39 UTC (rev 1223) |
| 31 |
+++ emacs-daemon/README 2009-01-21 06:20:38 UTC (rev 1224) |
| 32 |
@@ -10,7 +10,8 @@ |
| 33 |
Every user who wants to connect to an Emacs server must have an own |
| 34 |
instance of the daemonized GNU Emacs. The init script automatically |
| 35 |
determines the user by its name, so you create a symbolic link (do |
| 36 |
-not copy the script!) in your /etc/init.d directory: |
| 37 |
+not copy the script, or you will miss eventual updates!) in your |
| 38 |
+/etc/init.d directory: |
| 39 |
|
| 40 |
ln -s emacs /etc/init.d/emacs.<username> |
| 41 |
|
| 42 |
|
| 43 |
Modified: emacs-daemon/emacs.conf |
| 44 |
=================================================================== |
| 45 |
--- emacs-daemon/emacs.conf 2009-01-19 17:23:39 UTC (rev 1223) |
| 46 |
+++ emacs-daemon/emacs.conf 2009-01-21 06:20:38 UTC (rev 1224) |
| 47 |
@@ -18,8 +18,8 @@ |
| 48 |
# Timeout (in seconds) to wait for the daemon to detach |
| 49 |
#EMACS_TIMEOUT="30" |
| 50 |
|
| 51 |
-# Any additional options to pass to emacs --daemon |
| 52 |
-#EMACS_OPTS="" |
| 53 |
+# Options to pass to Emacs. Don't remove "--daemon". |
| 54 |
+#EMACS_OPTS="--daemon" |
| 55 |
|
| 56 |
# The SHELL variable to be passed to EMACS_START. emacs-wrapper.sh uses |
| 57 |
# this as the user's login shell. If (explicitely set to) empty, then |
| 58 |
|
| 59 |
Modified: emacs-daemon/emacs.rc |
| 60 |
=================================================================== |
| 61 |
--- emacs-daemon/emacs.rc 2009-01-19 17:23:39 UTC (rev 1223) |
| 62 |
+++ emacs-daemon/emacs.rc 2009-01-21 06:20:38 UTC (rev 1224) |
| 63 |
@@ -3,9 +3,10 @@ |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
# $Id$ |
| 66 |
|
| 67 |
-EMACS=${EMACS:-/usr/bin/emacs} |
| 68 |
-EMACS_START=${EMACS_START:-/usr/libexec/emacs/emacs-wrapper.sh} |
| 69 |
-EMACS_TIMEOUT=${EMACS_TIMEOUT:-30} |
| 70 |
+: ${EMACS:=/usr/bin/emacs} |
| 71 |
+: ${EMACS_OPTS:=--daemon} |
| 72 |
+: ${EMACS_START:=/usr/libexec/emacs/emacs-wrapper.sh} |
| 73 |
+: ${EMACS_TIMEOUT:=30} |
| 74 |
USER=${RC_SVCNAME#*.} |
| 75 |
PIDFILE_DIR=/var/run/emacs/${USER} |
| 76 |
PIDFILE=${PIDFILE_DIR}/emacs.pid |
| 77 |
@@ -53,7 +54,7 @@ |
| 78 |
start-stop-daemon --start \ |
| 79 |
--user "${USER}" --chdir "${home}" --pidfile "${PIDFILE}" \ |
| 80 |
--env EMACS="${EMACS}" --env EMACS_TIMEOUT="${EMACS_TIMEOUT}" \ |
| 81 |
- --exec "${EMACS_START}" -- --daemon ${EMACS_OPTS} |
| 82 |
+ --exec "${EMACS_START}" -- ${EMACS_OPTS} |
| 83 |
eend $? |
| 84 |
} |
Archives