aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-06-03 14:25:39 +0200
committerMichael Albinus2013-06-03 14:25:39 +0200
commit2041ae1fa791f61bf9f4a154de29a7bc167481d6 (patch)
tree951c4e8037d4b41d24e0f4694e718381cd9ec2c1
parent2f592f95d2344d4a28eb946848330dca49e0f5ee (diff)
downloademacs-2041ae1fa791f61bf9f4a154de29a7bc167481d6.tar.gz
emacs-2041ae1fa791f61bf9f4a154de29a7bc167481d6.zip
* cmdargs.texi (General Variables): Use "unix:path=/dev/null" as
dummy value for $DBUS_SESSION_BUS_ADDRESS. It also suppresses autolaunching of the D-Bus session bus.
-rw-r--r--doc/emacs/ChangeLog6
-rw-r--r--doc/emacs/cmdargs.texi4
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f0b89a15fcc..be906fd96fb 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
12013-06-02 Michael Albinus <michael.albinus@gmx.de>
2
3 * cmdargs.texi (General Variables): Use "unix:path=/dev/null" as
4 dummy value for $DBUS_SESSION_BUS_ADDRESS. It also suppresses
5 autolaunching of the D-Bus session bus.
6
12013-06-03 Juri Linkov <juri@jurta.org> 72013-06-03 Juri Linkov <juri@jurta.org>
2 8
3 * display.texi (Highlight Interactively): Add global keybindings 9 * display.texi (Highlight Interactively): Add global keybindings
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index e285104b5de..3dc64fdd127 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -438,8 +438,8 @@ when you specify a relative directory name.
438@item DBUS_SESSION_BUS_ADDRESS 438@item DBUS_SESSION_BUS_ADDRESS
439Used by D-Bus when Emacs is compiled with it. Usually, there is no 439Used by D-Bus when Emacs is compiled with it. Usually, there is no
440need to change it. Setting it to a dummy address, like 440need to change it. Setting it to a dummy address, like
441@samp{unix:path=/tmp/foo}, suppresses connections to the D-Bus session 441@samp{unix:path=/dev/null}, suppresses connections to the D-Bus session
442bus. 442bus as well as autolaunching the D-Bus session bus if not running yet.
443@item EMACSDATA 443@item EMACSDATA
444Directory for the architecture-independent files that come with Emacs. 444Directory for the architecture-independent files that come with Emacs.
445This is used to initialize the variable @code{data-directory}. 445This is used to initialize the variable @code{data-directory}.