merge emacs-23

7 files changed, 45 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bbc1648dec..87520c2721b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-27  Drew Adams  <drew.adams@oracle.com>
+
+        * dired.el (dired-save-positions): Doc fix.  (Bug#7119)
+
+2010-09-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (ELCFILES): Update.
+
+        * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Avoid
+        infinite recursion on erroneous lambda form.  (Bug#7114)
+
 2010-09-27  Kenichi Handa  <handa@m17n.org>
 
         * tar-mode.el (tar-header-block-tokenize): Decode filenames in
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index f9dc1710cc3..eaefbd7e734 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -311,11 +311,15 @@ ELCFILES = \
         $(lisp)/cedet/cedet.elc \
         $(lisp)/cedet/data-debug.elc \
         $(lisp)/cedet/ede.elc \
+        $(lisp)/cedet/ede/auto.elc \
         $(lisp)/cedet/ede/autoconf-edit.elc \
+        $(lisp)/cedet/ede/base.elc \
         $(lisp)/cedet/ede/cpp-root.elc \
+        $(lisp)/cedet/ede/custom.elc \
         $(lisp)/cedet/ede/dired.elc \
         $(lisp)/cedet/ede/emacs.elc \
         $(lisp)/cedet/ede/files.elc \
+        $(lisp)/cedet/ede/generic.elc \
         $(lisp)/cedet/ede/linux.elc \
         $(lisp)/cedet/ede/locate.elc \
         $(lisp)/cedet/ede/make.elc \
diff --git a/lisp/dired.el b/lisp/dired.el
index 4a23865dfca..bb0cc223281 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1177,7 +1177,7 @@ Preserves old cursor, marks/flags, hidden-p."
 The positions have the form (BUFFER-POSITION WINDOW-POSITIONS).
 
 BUFFER-POSITION is the point position in the current dired buffer.
-The buffer position have the form (BUFFER DIRED-FILENAME BUFFER-POINT).
+It has the form (BUFFER DIRED-FILENAME BUFFER-POINT).
 
 WINDOW-POSITIONS are current positions in all windows displaying
 this dired buffer.  The window positions have the form (WINDOW
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index e461010a6ce..4950511ebe2 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -381,9 +381,11 @@
                 form))
           ((or (byte-code-function-p fn)
                (eq 'lambda (car-safe fn)))
-           (byte-optimize-form-code-walker
-            (byte-compile-unfold-lambda form)
-            for-effect))
+           (let ((newform (byte-compile-unfold-lambda form)))
+             (if (eq newform form)
+                 ;; Some error occured, avoid infinite recursion
+                 form
+               (byte-optimize-form-code-walker newform for-effect))))
           ((memq fn '(let let*))
            ;; recursively enter the optimizer for the bindings and body
            ;; of a let or let*.  This for depth-firstness: forms that
diff --git a/src/ChangeLog b/src/ChangeLog
index 55636cc9f40..b756aebe8a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,20 @@
         * xfont.c (xfont_open): Fix setting of font->average_width from
         :avgwidth property (Bug#7123).
 
+2010-09-28  Michael Albinus  <michael.albinus@gmx.de>
+
+        * 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  <michael.albinus@gmx.de>
+
+        * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
+        (Bug#7113)
+
 2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xgselect.c (xg_select): Clear file descriptors not set from
diff --git a/src/dbusbind.c b/src/dbusbind.c
index f710741b591..f3a573d3bce 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2130,8 +2130,12 @@ message arrives.  */);
     doc: /* If non-nil, debug messages of D-Bus bindings are raised.  */);
 #ifdef DBUS_DEBUG
   Vdbus_debug = Qt;
+  /* We can also set environment DBUS_VERBOSE=1 in order to see more
+     traces.  */
 #else
   Vdbus_debug = Qnil;
+  /* We do not want to abort.  */
+  putenv ("DBUS_FATAL_WARNINGS=0");
 #endif
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);
diff --git a/src/keyboard.c b/src/keyboard.c
index 056e379a44a..22c58985a56 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4106,6 +4106,11 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
       /* 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 @@ timer_check (do_it_now)
 {
   EMACS_TIME nexttime;
 
-  do 
+  do
     {
       nexttime = timer_check_2 ();
     }
@@ -7051,11 +7056,6 @@ void
 gobble_input (expected)
      int expected;
 {
-#ifdef HAVE_DBUS
-  /* Read D-Bus messages.  */
-  xd_read_queued_messages ();
-#endif /* HAVE_DBUS */
-
 #ifdef SIGIO
   if (interrupt_input)
     {