[Emacs-diffs] Changes to emacs/lisp/speedbar.el

[Nick Roberts]

Index: emacs/lisp/speedbar.el
diff -u emacs/lisp/speedbar.el:1.80 emacs/lisp/speedbar.el:1.81
--- emacs/lisp/speedbar.el:1.80 Sat Apr  1 21:17:46 2006
+++ emacs/lisp/speedbar.el      Sun May  7 12:09:42 2006
@@ -2529,8 +2529,7 @@
                                  default-directory)
                (speedbar-message nil))))
       ;; Else, we can do a short cut.  No text cache.
-      (let ((cbd (expand-file-name default-directory))
-           )
+      (let ((cbd (expand-file-name default-directory)))
        (set-buffer speedbar-buffer)
        (speedbar-with-writable
          (let* ((window (get-buffer-window speedbar-buffer 0))
@@ -2542,8 +2541,7 @@
              (funcall func cbd 0))
            (speedbar-reconfigure-keymaps)
            (set-window-point window p)
-           (set-window-start window start)))
-       ))))
+           (set-window-start window start)))))))
 
 (defun speedbar-update-directory-contents ()
   "Update the contents of the speedbar buffer based on the current directory."
@@ -2677,7 +2675,6 @@
               (frame-visible-p (speedbar-current-frame))
               (not (eq (frame-visible-p (speedbar-current-frame)) 'icon)))
          (let ((af (selected-frame)))
-           (save-window-excursion
              (dframe-select-attached-frame speedbar-frame)
              ;; make sure we at least choose a window to
              ;; get a good directory from
@@ -2704,14 +2701,8 @@
                             "Updating speedbar to special mode: %s...done"
                             major-mode)
                            (speedbar-message nil))))
-                 ;; Update all the contents if directories change!
-                 (if (or (member major-mode speedbar-ignored-modes)
-                         (eq af (speedbar-current-frame))
-                         (not (buffer-file-name)))
-                     nil
-                   (speedbar-update-localized-contents)
-                   ))
-               (select-frame af)))
+                   (speedbar-update-localized-contents))
+               (select-frame af))
            ;; Now run stealthy updates of time-consuming items
            (speedbar-stealthy-updates)))))
   (run-hooks 'speedbar-timer-hook))