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

[Miles Bader]

Index: emacs/lisp/speedbar.el
diff -c emacs/lisp/speedbar.el:1.51 emacs/lisp/speedbar.el:1.52
*** emacs/lisp/speedbar.el:1.51 Sat Dec  7 16:30:22 2002
--- emacs/lisp/speedbar.el      Tue Feb  4 07:05:54 2003
***************
*** 932,938 ****
                     (looking-at "[0-9]+: *\\[[+-]\\] [^ \n]+ \\*?[!#]$"))]
      )
    "Additional menu items while in file-mode.")
!  
  (defvar speedbar-easymenu-definition-trailer
    (append
     (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
--- 932,938 ----
                     (looking-at "[0-9]+: *\\[[+-]\\] [^ \n]+ \\*?[!#]$"))]
      )
    "Additional menu items while in file-mode.")
! 
  (defvar speedbar-easymenu-definition-trailer
    (append
     (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
***************
*** 981,987 ****
  (if (fboundp 'frame-parameter)
  
      (defalias 'speedbar-frame-parameter 'frame-parameter)
!   
    (defun speedbar-frame-parameter (frame parameter)
      "Return FRAME's PARAMETER value."
      (cdr (assoc parameter (frame-parameters frame)))))
--- 981,987 ----
  (if (fboundp 'frame-parameter)
  
      (defalias 'speedbar-frame-parameter 'frame-parameter)
! 
    (defun speedbar-frame-parameter (frame parameter)
      "Return FRAME's PARAMETER value."
      (cdr (assoc parameter (frame-parameters frame)))))
***************
*** 2325,2331 ****
                            (if tag-button-function 'speedbar-highlight-face 
nil)
                            tag-button-function tag-button-data))
      ))
!   
  (defun speedbar-change-expand-button-char (char)
    "Change the expansion button character to CHAR for the current line."
    (save-excursion
--- 2325,2331 ----
                            (if tag-button-function 'speedbar-highlight-face 
nil)
                            tag-button-function tag-button-data))
      ))
! 
  (defun speedbar-change-expand-button-char (char)
    "Change the expansion button character to CHAR for the current line."
    (save-excursion
***************
*** 2639,2645 ****
    (speedbar-insert-generic-list indent lst
                                'speedbar-tag-expand
                                'speedbar-tag-find))
!                               
  (defun speedbar-insert-etags-list (indent lst)
    "At level INDENT, insert the etags generated LST."
    (speedbar-insert-generic-list indent lst
--- 2639,2645 ----
    (speedbar-insert-generic-list indent lst
                                'speedbar-tag-expand
                                'speedbar-tag-find))
! 
  (defun speedbar-insert-etags-list (indent lst)
    "At level INDENT, insert the etags generated LST."
    (speedbar-insert-generic-list indent lst
***************
*** 3343,3349 ****
  `speedbar-mode-functions-list' as `speedbar-line-path'."
    (let ((rf (speedbar-fetch-replacement-function 'speedbar-line-path)))
      (if rf (funcall rf depth) default-directory)))
!       
  (defun speedbar-files-line-path (&optional depth)
    "Retrieve the pathname associated with the current line.
  This may require traversing backwards from DEPTH and combining the default
--- 3343,3349 ----
  `speedbar-mode-functions-list' as `speedbar-line-path'."
    (let ((rf (speedbar-fetch-replacement-function 'speedbar-line-path)))
      (if rf (funcall rf depth) default-directory)))
! 
  (defun speedbar-files-line-path (&optional depth)
    "Retrieve the pathname associated with the current line.
  This may require traversing backwards from DEPTH and combining the default
***************
*** 3427,3438 ****
          (forward-char -2)
          (speedbar-do-function-pointer))
        (error (speedbar-position-cursor-on-line)))))
!   
  (defun speedbar-flush-expand-line ()
    "Expand the line under the cursor and flush any cached information."
    (interactive)
    (speedbar-expand-line 1))
!   
  (defun speedbar-contract-line ()
    "Contract the line under the cursor."
    (interactive)
--- 3427,3438 ----
          (forward-char -2)
          (speedbar-do-function-pointer))
        (error (speedbar-position-cursor-on-line)))))
! 
  (defun speedbar-flush-expand-line ()
    "Expand the line under the cursor and flush any cached information."
    (interactive)
    (speedbar-expand-line 1))
! 
  (defun speedbar-contract-line ()
    "Contract the line under the cursor."
    (interactive)
***************
*** 4194,4200 ****
      (defalias 'defimage-speedbar 'defimage)
  
    (if (not (fboundp 'make-glyph))
!       
  (defmacro defimage-speedbar (variable imagespec docstring)
    "Don't bother loading up an image...
  Argument VARIABLE is the variable to define.
--- 4194,4200 ----
      (defalias 'defimage-speedbar 'defimage)
  
    (if (not (fboundp 'make-glyph))
! 
  (defmacro defimage-speedbar (variable imagespec docstring)
    "Don't bother loading up an image...
  Argument VARIABLE is the variable to define.