2 files changed, 27 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97b25eb35a0..329fcdba26b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2005-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * arc-mode.el (archive-extract): Make it work as a mouse binding.
+        (archive-mouse-extract): Make it an obsolete alias.
+        (archive-mode-map): Don't use archive-mouse-extract any more.
+        (archive-mode, archive-extract): write-contents-hooks ->
+        write-contents-functions.
+        (archive-arc-rename-entry, archive-lzh-rename-entry): Remove unused
+        first arg.
+        (archive-rename-entry): Update the call.
+        (archive-zip-summarize): Remove unused var `method'.
+        (archive-lzh-summarize): Remove unused var `creator'.
+
+        * emacs-lisp/debug.el (debug): Quieten Drew Adams.
+
+        * arc-mode.el: Bind inhibit-read-only rather than buffer-read-only.
+        (archive-zip-extract, archive-zip-expunge)
+        (archive-zip-update, archive-zip-update-case): Use executable-find.
+        (archive-resummarize, archive-flag-deleted, archive-unmark-all-files):
+        Use restore-buffer-modified-p.
+        (archive-extract, archive-add-new-member, archive-write-file-member):
+        Use with-current-buffer.
+        (archive-lzh-ogm, archive-zip-chmod-entry): Use dolist.
+
 2005-06-30  Andreas Schwab  <schwab@suse.de>
 
         * progmodes/gud.el (gud-filter): Remove unneeded progn.
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index e543932d8b4..45b6e810ca1 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -231,7 +231,9 @@ first will be printed into the backtrace buffer."
                     ;; would need to be de-iconified anyway immediately
                     ;; after when we re-enter the debugger, so iconifying it
                     ;; here would cause flashing.
-                    (bury-buffer))))
+                    ;; Use quit-window rather than bury-buffer to quieten
+                    ;; Drew Adams.  --Stef
+                    (quit-window))))
             (kill-buffer debugger-buffer))
           (set-match-data debugger-outer-match-data)))
       ;; Put into effect the modified values of these variables