* speedbar.el: Remove RCS tag.

	(speedbar-check-read-only): Handle non-existent files.

	* dframe.el, ezimage.el, sb-image.el: Remove RCS tags.

	* info.el (Info-speedbar-hierarchy-buttons)
	(Info-speedbar-goto-node): Call speedbar-select-attached-frame.

6 files changed, 34 insertions, 29 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69fb7798069..165fe825693 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * speedbar.el: Remove RCS tag.
+        (speedbar-check-read-only): Handle non-existent files.
+
+        * dframe.el, ezimage.el, sb-image.el: Remove RCS tags.
+
+        * info.el (Info-speedbar-hierarchy-buttons)
+        (Info-speedbar-goto-node): Call speedbar-select-attached-frame.
+
 2005-10-01  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
         * textmodes/bibtex.el (bibtex-valid-entry-whitespace-re):
diff --git a/lisp/dframe.el b/lisp/dframe.el
index c2b2441a94d..b180d6bbf00 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -4,7 +4,6 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
-;; X-RCS: $Id: dframe.el,v 1.1 2005/09/30 13:18:43 cyd Exp $
 
 (defvar dframe-version "1.3"
   "The current version of the dedicated frame library.")
@@ -23,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index fc0c08621c8..dd3a1944306 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -4,7 +4,6 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
-;; X-RCS: $Id: ezimage.el,v 1.1 2005/09/30 13:15:10 cyd Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -20,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/info.el b/lisp/info.el
index 7868125b9b0..a7cabcde820 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4012,8 +4012,6 @@ This will add a speedbar major display mode."
   (speedbar-change-initial-expansion-list "Info")
   )
 
-(eval-when-compile (defvar speedbar-attached-frame))
-
 (defun Info-speedbar-hierarchy-buttons (directory depth &optional node)
   "Display an Info directory hierarchy in speedbar.
 DIRECTORY is the current directory in the attached frame.
@@ -4030,13 +4028,12 @@ specific node to expand."
     ;; being known at creation time.
     (if (not node)
         (speedbar-with-writable (insert "Info Nodes:\n")))
-    (let ((completions nil)
-          (cf (selected-frame)))
-      (select-frame speedbar-attached-frame)
+    (let ((completions nil))
+      (speedbar-select-attached-frame)
       (save-window-excursion
         (setq completions
               (Info-speedbar-fetch-file-nodes (or node '"(dir)top"))))
-      (select-frame cf)
+      (select-frame speedbar-frame)
       (if completions
           (speedbar-with-writable
            (dolist (completion completions)
@@ -4052,7 +4049,7 @@ specific node to expand."
 (defun Info-speedbar-goto-node (text node indent)
   "When user clicks on TEXT, go to an info NODE.
 The INDENT level is ignored."
-  (select-frame speedbar-attached-frame)
+  (speedbar-select-attached-frame)
   (let* ((buff (or (get-buffer "*info*")
                    (progn (info) (get-buffer "*info*"))))
          (bwin (get-buffer-window buff 0)))
@@ -4062,7 +4059,7 @@ The INDENT level is ignored."
           (raise-frame (window-frame bwin)))
       (if speedbar-power-click
           (let ((pop-up-frames t)) (select-window (display-buffer buff)))
-        (select-frame speedbar-attached-frame)
+        (speedbar-select-attached-frame)
         (switch-to-buffer buff)))
     (if (not (string-match "^(\\([^)]+\\))\\([^.]+\\)$" node))
         (error "Invalid node %s" node)
@@ -4128,7 +4125,7 @@ NODESPEC is a string of the form: (file)node."
       (nreverse completions))))
 
 ;;; Info mode node listing
-;; FIXME: Seems not to be used.  -stef
+;; This is called by `speedbar-add-localized-speedbar-support'
 (defun Info-speedbar-buttons (buffer)
   "Create a speedbar display to help navigation in an Info file.
 BUFFER is the buffer speedbar is requesting buttons for."
@@ -4136,8 +4133,7 @@ BUFFER is the buffer speedbar is requesting buttons for."
                       (let ((case-fold-search t))
                         (not (looking-at "Info Nodes:"))))
       (erase-buffer))
-  (Info-speedbar-hierarchy-buttons nil 0)
-  )
+  (Info-speedbar-hierarchy-buttons nil 0))
 
 (dolist (mess '("^First node in file$"
                 "^No `.*' in index$"
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index e36cc23de19..e1ed8d06a86 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -4,7 +4,6 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
-;; X-RCS: $Id: sb-image.el,v 1.1 2005/09/30 13:15:10 cyd Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -20,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 84411f12223..0978a31681e 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -4,7 +4,6 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
-;; X-RCS: $Id: speedbar.el,v 1.68 2005/09/30 13:15:10 cyd Exp $
 
 (defvar speedbar-version "1.0"
   "The current version of speedbar.")
@@ -27,8 +26,8 @@ this version is not backward compatible to 0.14 or earlier.")
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
@@ -2822,12 +2821,15 @@ indicator, then do not add a space."
                       (re-search-forward "^\\([0-9]+\\):\\s-*[[<][+-\?][]>] "
                                          nil t))
             (setq speedbar-ro-to-do-point (point))
-            (if (not (file-writable-p (speedbar-line-file)))
-                (speedbar-add-indicator
-                 speedbar-object-read-only-indicator
-                 (regexp-quote speedbar-object-read-only-indicator))
-              (speedbar-add-indicator
-               " " (regexp-quote speedbar-object-read-only-indicator))))
+            (let ((f (speedbar-line-file)))
+              (if f
+                  (if (not (file-writable-p f))
+                      (speedbar-add-indicator
+                       speedbar-object-read-only-indicator
+                       (regexp-quote speedbar-object-read-only-indicator))
+                    (speedbar-add-indicator
+                     " " (regexp-quote
+                          speedbar-object-read-only-indicator))))))
           (if (input-pending-p)
               ;; return that we are incomplete
               nil