[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/speedbar.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/speedbar.el [lexbind] |
Date: |
Sat, 04 Sep 2004 05:41:30 -0400 |
Index: emacs/lisp/speedbar.el
diff -c emacs/lisp/speedbar.el:1.42.2.4 emacs/lisp/speedbar.el:1.42.2.5
*** emacs/lisp/speedbar.el:1.42.2.4 Sat Sep 4 09:22:56 2004
--- emacs/lisp/speedbar.el Sat Sep 4 09:26:22 2004
***************
*** 92,98 ****
;; into sub-lists. A long flat list can be used instead if needed.
;; Other filters can be easily added.
;;
! ;; AUC-TEX users: The imenu tags for AUC-TEX mode doesn't work very
;; well. Use the imenu keywords from tex-mode.el for better results.
;;
;; This file requires the library package assoc (association lists)
--- 92,98 ----
;; into sub-lists. A long flat list can be used instead if needed.
;; Other filters can be easily added.
;;
! ;; AUCTEX users: The imenu tags for AUCTEX mode doesn't work very
;; well. Use the imenu keywords from tex-mode.el for better results.
;;
;; This file requires the library package assoc (association lists)
***************
*** 665,670 ****
--- 665,673 ----
"*Regexp matching files we don't want displayed in a speedbar buffer.
It is generated from the variable `completion-ignored-extensions'")
+ ;; Compiler silencing trick. The real defvar comes later in this file.
+ (defvar speedbar-file-regexp)
+
;; this is dangerous to customize, because the defaults will probably
;; change in the future.
(defcustom speedbar-supported-extension-expressions
***************
*** 691,696 ****
--- 694,705 ----
(setq speedbar-supported-extension-expressions val
speedbar-file-regexp (speedbar-extension-list-to-regex val))))
+ (defvar speedbar-file-regexp
+ (speedbar-extension-list-to-regex speedbar-supported-extension-expressions)
+ "Regular expression matching files we know how to expand.
+ Created from `speedbar-supported-extension-expression' with the
+ function `speedbar-extension-list-to-regex'")
+
(defcustom speedbar-scan-subdirs nil
"*Non-nil means speedbar will check if subdirs are empty.
That way you don't have to click on them to find out. But this
***************
*** 700,711 ****
:type 'boolean
:version 21.4)
- (defvar speedbar-file-regexp
- (speedbar-extension-list-to-regex speedbar-supported-extension-expressions)
- "Regular expression matching files we know how to expand.
- Created from `speedbar-supported-extension-expression' with the
- function `speedbar-extension-list-to-regex'")
-
(defun speedbar-add-supported-extension (extension)
"Add EXTENSION as a new supported extension for speedbar tagging.
This should start with a `.' if it is not a complete file name, and
--- 709,714 ----
***************
*** 1295,1302 ****
(toggle-read-only 1)
(speedbar-set-mode-line-format)
(if speedbar-xemacsp
! (set (make-local-variable 'mouse-motion-handler)
! 'speedbar-track-mouse-xemacs)
(if speedbar-track-mouse-flag
(set (make-local-variable 'track-mouse) t)) ;this could be messy.
(setq auto-show-mode nil)) ;no auto-show for Emacs
--- 1298,1306 ----
(toggle-read-only 1)
(speedbar-set-mode-line-format)
(if speedbar-xemacsp
! (with-no-warnings
! (set (make-local-variable 'mouse-motion-handler)
! 'speedbar-track-mouse-xemacs))
(if speedbar-track-mouse-flag
(set (make-local-variable 'track-mouse) t)) ;this could be messy.
(setq auto-show-mode nil)) ;no auto-show for Emacs
***************
*** 1345,1351 ****
frame and window to be the currently active frame and window."
(if (and (frame-live-p speedbar-frame)
(or (not speedbar-xemacsp)
! (specifier-instance has-modeline-p)))
(save-excursion
(set-buffer speedbar-buffer)
(let* ((w (or (speedbar-frame-width) 20))
--- 1349,1356 ----
frame and window to be the currently active frame and window."
(if (and (frame-live-p speedbar-frame)
(or (not speedbar-xemacsp)
! (with-no-warnings
! (specifier-instance has-modeline-p))))
(save-excursion
(set-buffer speedbar-buffer)
(let* ((w (or (speedbar-frame-width) 20))
***************
*** 1546,1554 ****
;; This gets the cursor where the user can see it.
(if (not (bolp)) (forward-char -1))
(sit-for 0)
! (if (< emacs-major-version 20)
! (mouse-major-mode-menu e)
! (mouse-major-mode-menu e nil))))
(defun speedbar-hack-buffer-menu (e)
"Control mouse 1 is buffer menu.
--- 1551,1557 ----
;; This gets the cursor where the user can see it.
(if (not (bolp)) (forward-char -1))
(sit-for 0)
! (mouse-major-mode-menu e nil)))
(defun speedbar-hack-buffer-menu (e)
"Control mouse 1 is buffer menu.