summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL6
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cdf55a377eb..e996efbe2e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-05 Michael Albinus <michael.albinus@gmx.de>
+
+ * INSTALL: Explain, how to disable D-Bus at all. (Bug#12112)
+
2012-08-05 Ulrich Müller <ulm@gentoo.org>
* configure.ac: Disable paxctl if binaries don't have a
diff --git a/INSTALL b/INSTALL
index 7e29d18bb73..58a758e02f4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -280,6 +280,12 @@ You can tell configure where to search for GTK by specifying
`--with-pkg-config-prog=PATH' where PATH is the pathname to
pkg-config. Note that GTK version 2.6 or newer is required for Emacs.
+Emacs will autolaunch a D-Bus session bus, when the environment
+variable DISPLAY is set, but no session bus is running. This might be
+inconvenient for Emacs when running as daemon or running via a remote
+ssh connection. In order to suppress D-Bus at all, configure Emacs
+with the options `--without-dbus --without-gconf --without-gsettings'.
+
The Emacs mail reader RMAIL is configured to be able to read mail from
a POP3 server by default. Versions of the POP protocol older than
POP3 are not supported. For Kerberos-authenticated POP add