From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OxH3k-0007mb-BE for garchives@archives.gentoo.org; Sun, 19 Sep 2010 10:23:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44BADE07AF; Sun, 19 Sep 2010 10:23:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2459FE07AF for ; Sun, 19 Sep 2010 10:23:40 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 783F31B408B for ; Sun, 19 Sep 2010 10:23:39 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2178) id 3985320051; Sun, 19 Sep 2010 10:23:37 +0000 (UTC) To: gentoo-commits@lists.gentoo.org From: "Ulrich Mueller (ulm)" Subject: [gentoo-commits] emacs r1566 - emacs-daemon X-VCS-Repository: emacs X-VCS-Revision: 1566 X-VCS-Files: emacs-daemon/emacs-stop.sh emacs-daemon/emacs.conf emacs-daemon/emacs.rc X-VCS-Directories: emacs-daemon X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=UTF-8 Message-Id: <20100919102337.3985320051@flycatcher.gentoo.org> Date: Sun, 19 Sep 2010 10:23:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 005cacc0-1e7e-4567-a792-228bb22d5fc1 X-Archives-Hash: 551e5941087f4581783555847ae55500 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D"(kill-emacs)" =20 -su "${USER}" -c "emacsclient --eval \"${EMACS_LISP_EXPR}\"" \ +su "${USER}" -c "${EMACSCLIENT} --eval \"${EMACS_LISP_EXPR}\"" \ /dev/null & pid=3D$! =20 Modified: emacs-daemon/emacs.conf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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.. =20 -# Absolute path to the Emacs binary +# Absolute path to the Emacs and emacsclient binaries #EMACS=3D"/usr/bin/emacs" +#EMACSCLIENT=3D"/usr/bin/emacsclient" =20 # 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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$ =20 : ${EMACS:=3D/usr/bin/emacs} +: ${EMACSCLIENT:=3D/usr/bin/emacsclient} : ${EMACS_OPTS:=3D--daemon} : ${EMACS_SHELL=3D/bin/bash} : ${EMACS_START:=3D/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