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

[Chong Yidong]

Index: emacs/lisp/speedbar.el
diff -c emacs/lisp/speedbar.el:1.68 emacs/lisp/speedbar.el:1.69
*** emacs/lisp/speedbar.el:1.68 Fri Sep 30 13:15:10 2005
--- emacs/lisp/speedbar.el      Sat Oct  1 03:01:42 2005
***************
*** 4,12 ****
  
  ;; Author: Eric M. Ludlam <address@hidden>
  ;; Keywords: file, tags, tools
! ;; X-RCS: $Id: speedbar.el,v 1.68 2005/09/30 13:15:10 cyd Exp $
  
! (defvar speedbar-version "1.0pre3"
    "The current version of speedbar.")
  (defvar speedbar-incompatible-version "0.14beta4"
    "This version of speedbar is incompatible with this version.
--- 4,12 ----
  
  ;; Author: Eric M. Ludlam <address@hidden>
  ;; Keywords: file, tags, tools
! ;; X-RCS: $Id: speedbar.el,v 1.69 2005/10/01 03:01:42 cyd Exp $
  
! (defvar speedbar-version "1.0"
    "The current version of speedbar.")
  (defvar speedbar-incompatible-version "0.14beta4"
    "This version of speedbar is incompatible with this version.
***************
*** 278,284 ****
  will be initialized to the height of the frame speedbar is
  attached to and added to this list before the new frame is initialized."
    :group 'speedbar
!   :type '(repeat (sexp :tag "Parameter:")))
  
  ;; These values by Hrvoje Niksic <address@hidden>
  (defcustom speedbar-frame-plist
--- 278,286 ----
  will be initialized to the height of the frame speedbar is
  attached to and added to this list before the new frame is initialized."
    :group 'speedbar
!   :type '(repeat (cons :format "%v"
!                      (symbol :tag "Parameter")
!                      (sexp :tag "Value"))))
  
  ;; These values by Hrvoje Niksic <address@hidden>
  (defcustom speedbar-frame-plist
***************
*** 297,303 ****
                        (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."
--- 299,305 ----
                        (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."
***************
*** 3598,3604 ****
  
      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.
--- 3600,3606 ----
  
      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.
***************
*** 4092,4098 ****
    )
  
  (provide 'speedbar)
- ;;; speedbar ends here
  
  ;; run load-time hooks
  (run-hooks 'speedbar-load-hook)
--- 4094,4102 ----
    )
  
  (provide 'speedbar)
  
  ;; run load-time hooks
  (run-hooks 'speedbar-load-hook)
+ 
+ ;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5
+ ;;; speedbar ends here