[gentoo-commits] emacs r1566 - emacs-daemon

[gentoo-commits] emacs r1566 - emacs-daemon

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2010-09-19 10:23:36 +0000 (Sun, 19 Sep 2010)
New Revision: 1566

Modified:
   emacs-daemon/emacs-stop.sh
   emacs-daemon/emacs.conf
   emacs-daemon/emacs.rc
Log:
Also export EMACSCLIENT variable.

Modified: emacs-daemon/emacs-stop.sh
===================================================================
--- emacs-daemon/emacs-stop.sh	2010-09-19 09:54:15 UTC (rev 1565)
+++ emacs-daemon/emacs-stop.sh	2010-09-19 10:23:36 UTC (rev 1566)
@@ -7,7 +7,7 @@
 # You can add additional commands here, or to kill-emacs-hook.
 EMACS_LISP_EXPR="(kill-emacs)"
 
-su "${USER}" -c "emacsclient --eval \"${EMACS_LISP_EXPR}\"" \
+su "${USER}" -c "${EMACSCLIENT} --eval \"${EMACS_LISP_EXPR}\"" \
     </dev/null &>/dev/null &
 pid=$!
 

Modified: emacs-daemon/emacs.conf
===================================================================
--- emacs-daemon/emacs.conf	2010-09-19 09:54:15 UTC (rev 1565)
+++ emacs-daemon/emacs.conf	2010-09-19 10:23:36 UTC (rev 1566)
@@ -2,8 +2,9 @@
 # This can also be used as multiplexed configuration, i.e. runscript
 # looks for both /etc/conf.d/emacs and /etc/conf.d/emacs.<user>.
 
-# Absolute path to the Emacs binary
+# Absolute path to the Emacs and emacsclient binaries
 #EMACS="/usr/bin/emacs"
+#EMACSCLIENT="/usr/bin/emacsclient"
 
 # Emacs detaches and exits the parent process only after loading the
 # user's .emacs (initialisation). Anything may happen there, so we use

Modified: emacs-daemon/emacs.rc
===================================================================
--- emacs-daemon/emacs.rc	2010-09-19 09:54:15 UTC (rev 1565)
+++ emacs-daemon/emacs.rc	2010-09-19 10:23:36 UTC (rev 1566)
@@ -4,6 +4,7 @@
 # $Id$
 
 : ${EMACS:=/usr/bin/emacs}
+: ${EMACSCLIENT:=/usr/bin/emacsclient}
 : ${EMACS_OPTS:=--daemon}
 : ${EMACS_SHELL=/bin/bash}
 : ${EMACS_START:=/usr/libexec/emacs/emacs-wrapper.sh}
@@ -71,7 +72,7 @@
 stop() {
     # Optionally, call a custom script before stopping.
     if [ "${EMACS_STOP}" ] && [ -x "${EMACS_STOP}" ]; then
-	export USER PIDFILE EMACS EMACS_TIMEOUT EMACS_DEBUG
+	export USER PIDFILE EMACS EMACSCLIENT EMACS_TIMEOUT EMACS_DEBUG
 	ebegin "Calling Emacs stop script for ${USER}"
 	"${EMACS_STOP}"
 	eend $? || return