[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100068: * dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it

[Michael Albinus]

------------------------------------------------------------
revno: 100068
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-09-28 15:39:22 +0200
message:
  * dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
  is more portable.
  
  * keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
  (kbd_buffer_get_event): ... here. This is needed for cygwin, which
  has not defined SIGIO.
modified:
  src/ChangeLog
  src/dbusbind.c
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-27 12:44:26 +0000
+++ b/src/ChangeLog     2010-09-28 13:39:22 +0000
@@ -1,3 +1,12 @@
+2010-09-28  Michael Albinus  <address@hidden>
+
+       * dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
+       is more portable.
+
+       * keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
+       (kbd_buffer_get_event): ... here. This is needed for cygwin, which
+       has not defined SIGIO.
+
 2010-09-27  Michael Albinus  <address@hidden>
 
        * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2010-09-27 13:27:54 +0000
+++ b/src/dbusbind.c    2010-09-28 13:39:22 +0000
@@ -2135,7 +2135,7 @@
 #else
   Vdbus_debug = Qnil;
   /* We do not want to abort.  */
-  setenv ("DBUS_FATAL_WARNINGS", "0", 1);
+  putenv ("DBUS_FATAL_WARNINGS=0");
 #endif
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-07-05 17:16:59 +0000
+++ b/src/keyboard.c    2010-09-28 13:39:22 +0000
@@ -4106,6 +4106,11 @@
       /* One way or another, wait until input is available; then, if
         interrupt handlers have not read it, read it now.  */
 
+#ifdef HAVE_DBUS
+      /* Read D-Bus messages.  */
+      xd_read_queued_messages ();
+#endif /* HAVE_DBUS */
+
 /* Note SIGIO has been undef'd if FIONREAD is missing.  */
 #ifdef SIGIO
       gobble_input (0);
@@ -4757,7 +4762,7 @@
 {
   EMACS_TIME nexttime;
 
-  do 
+  do
     {
       nexttime = timer_check_2 ();
     }
@@ -7051,11 +7056,6 @@
 gobble_input (expected)
      int expected;
 {
-#ifdef HAVE_DBUS
-  /* Read D-Bus messages.  */
-  xd_read_queued_messages ();
-#endif /* HAVE_DBUS */
-
 #ifdef SIGIO
   if (interrupt_input)
     {