[Emacs-diffs] /srv/bzr/emacs/trunk r109725: * dbusbind.c (xd_remove_watch): Do not assume C99 comments.

[Paul Eggert]

------------------------------------------------------------
revno: 109725
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-21 09:54:50 -0700
message:
  * dbusbind.c (xd_remove_watch): Do not assume C99 comments.
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-21 10:21:04 +0000
+++ b/src/ChangeLog     2012-08-21 16:54:50 +0000
@@ -1,3 +1,7 @@
+2012-08-21  Paul Eggert  <address@hidden>
+
+       * dbusbind.c (xd_remove_watch): Do not assume C99 comments.
+
 2012-08-21  Dmitry Antipov  <address@hidden>
 
        Avoid direct writes to contents member of struct Lisp_Vector.

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2012-07-29 08:18:29 +0000
+++ b/src/dbusbind.c    2012-08-21 16:54:50 +0000
@@ -1039,11 +1039,13 @@
     return;
 
   /* Unset session environment.  */
+#if 0
   if (XSYMBOL (QCdbus_session_bus) == data)
     {
-      //      XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS");
-      //      unsetenv ("DBUS_SESSION_BUS_ADDRESS");
+      XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS");
+      unsetenv ("DBUS_SESSION_BUS_ADDRESS");
     }
+#endif
 
   if (flags & DBUS_WATCH_WRITABLE)
     delete_write_fd (fd);