2 files changed, 4 insertions, 22 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c327d42a697..901e98c838a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-30  Nick Roberts  <nickrob@snap.net.nz>
 
+        * progmodes/gud.el (gud-stop-subjob): Make it work in all buffers.
+
         * progmodes/gdb-ui.el: Move gdb-mouse-toggle-breakpoint-* to
         C-mouse-1.  Move gdb-mouse-until to mouse-3, gdb-mouse-jump
         to C-mouse-3 (for 2 button mice).
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index b3913f6f6c6..e5ab181e8c6 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -921,8 +921,6 @@ This basically creates a sparse keymap, and makes it's parent be
    (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
        (list ["Customize..." speedbar-customize t]))
    (list
-    ["Detach" speedbar-detach (and speedbar-frame
-                                    (eq (selected-frame) speedbar-frame)) ]
     ["Close" dframe-close-frame t]
     ["Quit" delete-frame t] ))
   "Menu items appearing at the end of the speedbar menu.")
@@ -1047,21 +1045,6 @@ supported at a time.
                                   (dframe-attached-frame speedbar-frame)
                                   speedbar-default-position))))
 
-(defun speedbar-detach ()
-  "Detach the current Speedbar from auto-updating.
-Doing this allows the creation of a second speedbar."
-  (interactive)
-  (let ((buffer speedbar-buffer))
-    (dframe-detach 'speedbar-frame 'speedbar-cached-frame 'speedbar-buffer)
-    (save-excursion
-      (set-buffer buffer)
-      ;; Permanently disable auto-updating in this speedbar buffer.
-      (set (make-local-variable 'speedbar-update-flag) nil)
-      (set (make-local-variable 'speedbar-update-flag-disable) t)
-      ;; Make local copies of all the different variables to prevent
-      ;; funny stuff later...
-      )))
-
 (defsubst speedbar-current-frame ()
   "Return the frame to use for speedbar based on current context."
   (dframe-current-frame 'speedbar-frame 'speedbar-mode))
@@ -1224,11 +1207,8 @@ and the existence of packages."
                  (speedbar-initial-menu)
                (save-excursion
                  (dframe-select-attached-frame speedbar-frame)
-                 (if (local-variable-p
-                      'speedbar-easymenu-definition-special
-                      (current-buffer))
-                     ;; If bound locally, we can use it
-                     speedbar-easymenu-definition-special)))
+                  (eval (nth 1 (assoc speedbar-initial-expansion-list-name
+                                speedbar-initial-expansion-mode-alist)))))
              ;; Dynamic menu stuff
              '("-")
             (list (cons "Displays"