(install): Synchronize rules for compiling with Unix version.

[bpt/emacs.git] / lisp / speedbar.el

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index e461501..b129355 100644 (file)
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -5,7 +5,6 @@
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.8.1
 ;; Keywords: file, tags, tools
-;; X-RCS: $Id: speedbar.el,v 1.22 1999/03/13 04:52:25 kwzh Exp kwzh $
 
 ;; This file is part of GNU Emacs.
 
@@ -32,33 +31,16 @@
 ;;
 ;; Starting Speedbar:
 ;;
-;;   If speedbar came to you as a part of Emacs, simply type
-;; `M-x speedbar', and it will be autoloaded for you.
-;;
-;;   If speedbar is not a part of your distribution, then add
-;; this to your .emacs file:
-;;
-;;   (autoload 'speedbar-frame-mode "speedbar" "Popup a speedbar frame" t)
-;;   (autoload 'speedbar-get-focus "speedbar" "Jump to speedbar frame" t)
-;;
+;;   Simply type `M-x speedbar', and it will be autoloaded for you.
+
 ;;   If you want to choose it from a menu, such as "Tools", you can do this:
 ;;
-;;   Emacs:
 ;;   (define-key-after (lookup-key global-map [menu-bar tools])
 ;;      [speedbar] '("Speedbar" . speedbar-frame-mode) [calendar])
 ;;
-;;   XEmacs:
-;;   (add-menu-button '("Tools")
-;;                   ["Speedbar" speedbar-frame-mode
-;;                    :style toggle
-;;                    :selected (and (boundp 'speedbar-frame)
-;;                                   (frame-live-p speedbar-frame)
-;;                                   (frame-visible-p speedbar-frame))]
-;;                   "--")
-;;
 ;;   If you want to access speedbar using only the keyboard, do this:
 ;;
-;;   (global-set-key [(f4)] 'speedbar-get-focus)
+;;   (global-set-key [f4] 'speedbar-get-focus)
 ;;
 ;;   This will let you hit f4 (or whatever key you choose) to jump
 ;; focus to the speedbar frame.  Pressing it again will bring you back
@@ -110,23 +92,9 @@
 ;; into sub-lists.  A long flat list can be used instead if needed.
 ;; Other filters could be easily added.
 ;;
-;;    Users of XEmacs previous to 20 may want to change the default
-;; timeouts for `speedbar-update-speed' to something longer as XEmacs
-;; doesn't have idle timers, the speedbar timer keeps going off
-;; arbitrarily while you're typing.  It's quite pesky.
-;;
-;;    Users of really old emacsen without the needed timers will not
-;; have speedbar updating automatically.  Use "r" to refresh the
-;; display after changing directories.  Remember, do not interrupt the
-;; stealthy updates or your display may not be completely refreshed.
-;;
 ;;    AUC-TEX users: The imenu tags for AUC-TEX mode don't work very
 ;; well.  Use the imenu keywords from tex-mode.el for better results.
 ;;
-;; This file requires the library package assoc (association lists)
-;; and the package custom (for easy configuration of speedbar)
-;;     http://www.dina.kvl.dk/~abraham/custom/
-;;
 ;;; Developing for speedbar
 ;;
 ;; Adding a speedbar specialized display mode:
@@ -210,29 +178,6 @@
 (defvar speedbar-xemacs20p (and speedbar-xemacsp
                                (= emacs-major-version 20)))
 
-;; From custom web page for compatibility between versions of custom:
-(eval-and-compile
-  (condition-case ()
-      (require 'custom)
-    (error nil))
-  (if (and (featurep 'custom) (fboundp 'custom-declare-variable)
-          ;; Some XEmacsen w/ custom don't have :set keyword.
-          ;; This protects them against custom.
-          (fboundp 'custom-initialize-set))
-      nil ;; We've got what we needed
-    ;; We have the old custom-library, hack around it!
-    (defmacro defgroup (&rest args)
-      nil)
-    (defmacro defface (var values doc &rest args)
-      (` (progn
-          (defvar (, var) (quote (, var)))
-          ;; To make colors for your faces you need to set your .Xdefaults
-          ;; or set them up ahead of time in your .emacs file.
-          (make-face (, var))
-          )))
-    (defmacro defcustom (var value doc &rest args)
-      (` (defvar (, var) (, value) (, doc))))))
-
 ;; customization stuff
 (defgroup speedbar nil
   "File and tag browser frame."
@@ -2165,7 +2110,8 @@ INDEX is not used, but is required by the caller."
                              'speedbar-directory-face
                              'speedbar-highlight-face
                              'speedbar-directory-buttons-follow
-                             (if (= (match-beginning 1) p)
+                             (if (and (= (match-beginning 1) p)
+                                       (not (char-equal (char-after (+ p 1)) ?:)))
                                  (expand-file-name "~/")  ;the tilde
                                (buffer-substring-no-properties
                                 p (match-end 0)))))