4 files changed, 41 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 618da3e801a..eab25b25864 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4097,6 +4097,7 @@ return window edges in units of pixels, rather than columns and lines.
 +++
 *** The new macro `with-selected-window' temporarily switches the
 selected window without impacting the order of `buffer-list'.
+It saves and restores the current buffer, too.
 
 +++
 *** `select-window' takes an optional second argument NORECORD.
@@ -4106,7 +4107,8 @@ This is like `switch-to-buffer'.
 +++
 *** `save-selected-window' now saves and restores the selected window
 of every frame.  This way, it restores everything that can be changed
-by calling `select-window'.
+by calling `select-window'.  It also saves and restores the current
+buffer.
 
 +++
 *** `set-window-buffer' has an optional argument KEEP-MARGINS.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1552757440..9d879823f8a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2005-06-25  Richard M. Stallman  <rms@gnu.org>
+
+        * jka-compr.el (jka-compr-insert-file-contents):
+        Special handling if cannot find the uncompression program.
+
+        * cus-face.el (custom-face-attributes): Add autoload.
+
+        * emacs-lisp/lisp-mode.el (lisp-mode-variables):
+        Bind comment-indent-function locally.
+
+        * window.el (save-selected-window): Use save-current-buffer.
+
+        * subr.el (with-selected-window): Use save-current-buffer.
+
+        * progmodes/gud.el (gud-filter): Simplify using with-selected-window
+        and with-current-buffer.
+
 2005-06-24  Richard M. Stallman  <rms@gnu.org>
 
         * simple.el (line-move-1): Fix previous change.
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 3ba2405e1a1..5e70467405e 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-25  Richard M. Stallman  <rms@gnu.org>
+
+        * objects.texi (Equality Predicates): Clarify meaning of equal.
+
+        * windows.texi (Selecting Windows): save-selected-window
+        and with-selected-window save and restore the current buffer.
+
 2005-06-24  Richard M. Stallman  <rms@gnu.org>
 
         * numbers.texi (Float Basics): Explain how to test for NaN,
diff --git a/src/ChangeLog b/src/ChangeLog
index 44f00321d36..17917b159e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,19 @@
 2005-06-25  Richard M. Stallman  <rms@gnu.org>
 
+        * eval.c (call_debugger): Take full care of extending stack limits
+        to make space for the debugger, and restore the change afterward.
+        Bind debug-on-error to nil.
+        (restore_stack_limits): New subroutine.
+        (Fsignal): Extend specpdl bound along with eval depth bound,
+        for calling edebug.  Don't do either one, for calling debugger.
+        (find_handler_clause): Don't bind debug-on-error here.
+        Don't unbind anything either.
+        Temporarily advance max_specpdl_size for calling
+        internal_with_output_to_temp_buffer.
+        (grow_specpdl): Don't alter max_specpdl_size before signaling
+        an error.
+        (syms_of_eval) <max-specpdl-size>: Doc fix.
+
         * lread.c (read1): 0.0e+NaN should make a "positive" NaN.
 
 2005-06-24  Eli Zaretskii  <eliz@gnu.org>