From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A718B1381F3 for ; Tue, 6 Aug 2013 19:10:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A76BE0A40; Tue, 6 Aug 2013 19:10:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A109BE0A40 for ; Tue, 6 Aug 2013 19:10:02 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC66F335E2B for ; Tue, 6 Aug 2013 19:10:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BD00EE545C for ; Tue, 6 Aug 2013 19:09:57 +0000 (UTC) From: "Ulrich Mueller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Mueller" Message-ID: <1375816182.f7ce8ab15e5ccb0f2c4acc038d0442e28a6d7fa0.ulm@gentoo> Subject: [gentoo-commits] proj/emacs-tools:emacs-daemon commit in: / X-VCS-Repository: proj/emacs-tools X-VCS-Files: ChangeLog emacs-stop.sh emacs.conf emacs.rc X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: f7ce8ab15e5ccb0f2c4acc038d0442e28a6d7fa0 X-VCS-Branch: emacs-daemon Date: Tue, 6 Aug 2013 19:09:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c06d0fd0-427c-44eb-adbf-b5766f1bb06a X-Archives-Hash: f1ac0a54de450fcc97824e4e353a1e22 commit: f7ce8ab15e5ccb0f2c4acc038d0442e28a6d7fa0 Author: Ulrich Müller gentoo org> AuthorDate: Tue Aug 6 19:09:42 2013 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Tue Aug 6 19:09:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f7ce8ab1 New variable EMACSCLIENT_OPTS. * emacs-stop.sh: New variable EMACSCLIENT_OPTS, allows to specify additional options for emacsclient. * emacs.rc (stop): Export EMACSCLIENT_OPTS to environment. * emacs.conf: Add explanation for new variable. --- ChangeLog | 7 +++++++ emacs-stop.sh | 3 ++- emacs.conf | 4 ++++ emacs.rc | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e1b769..75c0d8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-08-06 Ulrich Müller + + * emacs-stop.sh: New variable EMACSCLIENT_OPTS, allows to specify + additional options for emacsclient. + * emacs.rc (stop): Export EMACSCLIENT_OPTS to environment. + * emacs.conf: Add explanation for new variable. + 2013-03-23 Ulrich Müller * Version 0.20 released. diff --git a/emacs-stop.sh b/emacs-stop.sh index fececd7..58aaeef 100644 --- a/emacs-stop.sh +++ b/emacs-stop.sh @@ -6,7 +6,8 @@ # Any additional commands should preferably be added to kill-emacs-hook. EMACS_LISP_EXPR="(kill-emacs)" -su "${USER}" -c "${EMACSCLIENT} --eval \"${EMACS_LISP_EXPR}\"" \ +su "${USER}" \ + -c "${EMACSCLIENT} ${EMACSCLIENT_OPTS} --eval \"${EMACS_LISP_EXPR}\"" \ /dev/null & pid=$! diff --git a/emacs.conf b/emacs.conf index dce7d78..4c7549c 100644 --- a/emacs.conf +++ b/emacs.conf @@ -22,6 +22,10 @@ # Options to pass to emacs. Don't remove "--daemon". #EMACS_OPTS="--daemon" +# Options to pass to emacsclient. This variable is only used if you +# call emacsclient from a custom stop script, see EMACS_STOP above. +#EMACSCLIENT_OPTS="" + # The SHELL variable to be passed to EMACS_START. emacs-wrapper.sh uses # this as the user's login shell. If (explicitly set to) empty, then # the shell field from the passwd file is used. diff --git a/emacs.rc b/emacs.rc index 3ab53f7..b7ee39c 100644 --- a/emacs.rc +++ b/emacs.rc @@ -67,7 +67,8 @@ start() { stop() { # Optionally, call a custom script before stopping. if [ "${EMACS_STOP}" ] && [ -x "${EMACS_STOP}" ]; then - export USER PIDFILE EMACS EMACSCLIENT EMACS_TIMEOUT EMACS_DEBUG + export USER PIDFILE EMACS EMACS_TIMEOUT EMACS_DEBUG + export EMACSCLIENT EMACSCLIENT_OPTS ebegin "Calling Emacs stop script for ${USER}" "${EMACS_STOP}" eend $? || return