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

[Stefan Monnier]

Index: emacs/lisp/speedbar.el
diff -c emacs/lisp/speedbar.el:1.60 emacs/lisp/speedbar.el:1.61
*** emacs/lisp/speedbar.el:1.60 Fri Oct 29 20:57:51 2004
--- emacs/lisp/speedbar.el      Fri Jan 28 02:20:38 2005
***************
*** 1,6 ****
  ;;; speedbar.el --- quick access to files and tags in a frame
  
! ;;; Copyright (C) 1996, 97, 98, 99, 2000, 01 Free Software Foundation
  
  ;; Author: Eric M. Ludlam <address@hidden>
  ;; Version: 0.11a
--- 1,7 ----
  ;;; speedbar.el --- quick access to files and tags in a frame
  
! ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2005
! ;;           Free Software Foundation
  
  ;; Author: Eric M. Ludlam <address@hidden>
  ;; Version: 0.11a
***************
*** 170,175 ****
--- 171,178 ----
  ;; - More functions to create buttons and options
  ;; - Timeout directories we haven't visited in a while.
  
+ ;;; Code:
+ 
  (require 'assoc)
  (require 'easymenu)
  
***************
*** 201,207 ****
    :prefix "speedbar-"
    :group 'speedbar)
  
- ;;; Code:
  (defvar speedbar-initial-expansion-mode-alist
    '(("buffers" speedbar-buffer-easymenu-definition speedbar-buffers-key-map
       speedbar-buffer-buttons)
--- 204,209 ----
***************
*** 373,379 ****
                        (symbol :tag "Property")
                        (sexp :tag "Value"))))
  
! (defcustom speedbar-use-imenu-flag (stringp (locate-library "imenu"))
    "*Non-nil means use imenu for file parsing.  nil to use etags.
  XEmacs prior to 20.4 doesn't support imenu, therefore the default is to
  use etags instead.  Etags support is not as robust as imenu support."
--- 375,381 ----
                        (symbol :tag "Property")
                        (sexp :tag "Value"))))
  
! (defcustom speedbar-use-imenu-flag (fboundp 'imenu)
    "*Non-nil means use imenu for file parsing.  nil to use etags.
  XEmacs prior to 20.4 doesn't support imenu, therefore the default is to
  use etags instead.  Etags support is not as robust as imenu support."
***************
*** 3749,3755 ****
  
      nil
  
! (eval-when-compile (if (locate-library "imenu") (require 'imenu)))
  
  (defun speedbar-fetch-dynamic-imenu (file)
    "Load FILE into a buffer, and generate tags using Imenu.
--- 3751,3757 ----
  
      nil
  
! (eval-when-compile (condition-case nil (require 'imenu) (error nil)))
  
  (defun speedbar-fetch-dynamic-imenu (file)
    "Load FILE into a buffer, and generate tags using Imenu.
***************
*** 4359,4363 ****
  ;; run load-time hooks
  (run-hooks 'speedbar-load-hook)
  
! ;;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5
  ;;; speedbar.el ends here
--- 4361,4365 ----
  ;; run load-time hooks
  (run-hooks 'speedbar-load-hook)
  
! ;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5
  ;;; speedbar.el ends here