merge emacs-23

4 files changed, 21 insertions, 4 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