HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
lisp
/
speedbar.el
diff --git
a/lisp/speedbar.el
b/lisp/speedbar.el
index
28879fe
..
70bf5f4
100644
(file)
--- a/
lisp/speedbar.el
+++ b/
lisp/speedbar.el
@@
-1,6
+1,6
@@
;;; speedbar --- quick access to files and tags in a frame
;;; speedbar --- quick access to files and tags in a frame
-;; Copyright (C) 1996-201
2
Free Software Foundation, Inc.
+;; Copyright (C) 1996-201
3
Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: file, tags, tools
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: file, tags, tools
@@
-706,7
+706,7
@@
will be stripped by a simplified optimizer when compiled into a
singular expression. This variable will be turned into
`speedbar-file-regexp' for use with speedbar. You should use the
function `speedbar-add-supported-extension' to add a new extension at
singular expression. This variable will be turned into
`speedbar-file-regexp' for use with speedbar. You should use the
function `speedbar-add-supported-extension' to add a new extension at
-runtime, or use the configuration dialog to set it in your
.emacs
file.
+runtime, or use the configuration dialog to set it in your
init
file.
If you add an extension to this list, and it does not appear, you may
need to also modify `completion-ignored-extension' which will also help
file completion."
If you add an extension to this list, and it does not appear, you may
need to also modify `completion-ignored-extension' which will also help
file completion."
@@
-763,7
+763,7
@@
DIRECTORY-EXPRESSION to `speedbar-ignored-directory-expressions'."
"Non-nil means to automatically update the display.
When this is nil then speedbar will not follow the attached frame's directory.
If you want to change this while speedbar is active, either use
"Non-nil means to automatically update the display.
When this is nil then speedbar will not follow the attached frame's directory.
If you want to change this while speedbar is active, either use
-\\[customize] or call \\<speedbar-
key
-map> `\\[speedbar-toggle-updates]'."
+\\[customize] or call \\<speedbar-
mode
-map> `\\[speedbar-toggle-updates]'."
:group 'speedbar
:initialize 'custom-initialize-default
:set (lambda (sym val)
:group 'speedbar
:initialize 'custom-initialize-default
:set (lambda (sym val)
@@
-1083,7
+1083,7
@@
Return nil if it doesn't exist."
(define-derived-mode speedbar-mode fundamental-mode "Speedbar"
"Major mode for managing a display of directories and tags.
(define-derived-mode speedbar-mode fundamental-mode "Speedbar"
"Major mode for managing a display of directories and tags.
-\\<speedbar-
key
-map>
+\\<speedbar-
mode
-map>
The first line represents the default directory of the speedbar frame.
Each directory segment is a button which jumps speedbar's default
directory to that directory. Buttons are activated by clicking `\\[speedbar-click]'.
The first line represents the default directory of the speedbar frame.
Each directory segment is a button which jumps speedbar's default
directory to that directory. Buttons are activated by clicking `\\[speedbar-click]'.
@@
-1120,7
+1120,7
@@
category of tags. Click the {+} to expand the category. Jump-able
tags start with >. Click the name of the tag to go to that position
in the selected file.
tags start with >. Click the name of the tag to go to that position
in the selected file.
-\\{speedbar-
key
-map}"
+\\{speedbar-
mode
-map}"
(save-excursion
(setq font-lock-keywords nil) ;; no font-locking please
(setq truncate-lines t)
(save-excursion
(setq font-lock-keywords nil) ;; no font-locking please
(setq truncate-lines t)
@@
-1864,9
+1864,7
@@
of the special mode functions."
;; If it is autoloaded, we need to load it now so that
;; we have access to the variable -speedbar-menu-items.
;; Is this XEmacs safe?
;; If it is autoloaded, we need to load it now so that
;; we have access to the variable -speedbar-menu-items.
;; Is this XEmacs safe?
- (let ((sf (symbol-function v)))
- (if (and (listp sf) (eq (car sf) 'autoload))
- (load-library (car (cdr sf)))))
+ (autoload-do-load (symbol-function v) v)
(setq speedbar-special-mode-expansion-list (list v))
(setq v (intern-soft (concat ms "-speedbar-key-map")))
(if (not v)
(setq speedbar-special-mode-expansion-list (list v))
(setq v (intern-soft (concat ms "-speedbar-key-map")))
(if (not v)
@@
-3610,6
+3608,7
@@
functions to do caching and flushing if appropriate."
nil
(eval-when-compile (condition-case nil (require 'imenu) (error nil)))
nil
(eval-when-compile (condition-case nil (require 'imenu) (error nil)))
+(declare-function imenu--make-index-alist "imenu" (&optional no-error))
(defun speedbar-fetch-dynamic-imenu (file)
"Load FILE into a buffer, and generate tags using Imenu.
(defun speedbar-fetch-dynamic-imenu (file)
"Load FILE into a buffer, and generate tags using Imenu.
@@
-4005,73
+4004,68
@@
TEXT is the buffer's name, TOKEN and INDENT are unused."
;;; Color loading section.
;;
(defface speedbar-button-face '((((class color) (background light))
;;; Color loading section.
;;
(defface speedbar-button-face '((((class color) (background light))
-
(:foreground "green4")
)
+
:foreground "green4"
)
(((class color) (background dark))
(((class color) (background dark))
-
(:foreground "green3")
))
- "
Face used
for +/- buttons."
+
:foreground "green3"
))
+ "
Speedbar face
for +/- buttons."
:group 'speedbar-faces)
(defface speedbar-file-face '((((class color) (background light))
:group 'speedbar-faces)
(defface speedbar-file-face '((((class color) (background light))
-
(:foreground "cyan4")
)
+
:foreground "cyan4"
)
(((class color) (background dark))
(((class color) (background dark))
-
(:foreground "cyan")
)
- (t
(:bold t)
))
- "
Face used
for file names."
+
:foreground "cyan"
)
+ (t
:weight bold
))
+ "
Speedbar face
for file names."
:group 'speedbar-faces)
(defface speedbar-directory-face '((((class color) (background light))
:group 'speedbar-faces)
(defface speedbar-directory-face '((((class color) (background light))
-
(:foreground "blue4")
)
+
:foreground "blue4"
)
(((class color) (background dark))
(((class color) (background dark))
-
(:foreground "light blue")
))
- "
Face used
for directory names."
+
:foreground "light blue"
))
+ "
Speedbar face
for directory names."
:group 'speedbar-faces)
:group 'speedbar-faces)
+
(defface speedbar-tag-face '((((class color) (background light))
(defface speedbar-tag-face '((((class color) (background light))
-
(:foreground "brown")
)
+
:foreground "brown"
)
(((class color) (background dark))
(((class color) (background dark))
-
(:foreground "yellow")
))
- "
Face used for displaying
tags."
+
:foreground "yellow"
))
+ "
Speedbar face for
tags."
:group 'speedbar-faces)
(defface speedbar-selected-face '((((class color) (background light))
:group 'speedbar-faces)
(defface speedbar-selected-face '((((class color) (background light))
-
(:foreground "red" :underline t)
)
+
:foreground "red" :underline t
)
(((class color) (background dark))
(((class color) (background dark))
-
(:foreground "red" :underline t)
)
- (t
(:underline t)
))
- "
Face used to underline
the file in the active window."
+
:foreground "red" :underline t
)
+ (t
:underline t
))
+ "
Speedbar face for
the file in the active window."
:group 'speedbar-faces)
(defface speedbar-highlight-face '((((class color) (background light))
:group 'speedbar-faces)
(defface speedbar-highlight-face '((((class color) (background light))
-
(:background "green")
)
+
:background "green"
)
(((class color) (background dark))
(((class color) (background dark))
- (:background "sea green"))
- (((class grayscale monochrome)
- (background light))
- (:background "black"))
- (((class grayscale monochrome)
- (background dark))
- (:background "white")))
- "Face used for highlighting buttons with the mouse."
+ :background "sea green"))
+ "Speedbar face for highlighting buttons with the mouse."
:group 'speedbar-faces)
(defface speedbar-separator-face '((((class color) (background light))
:group 'speedbar-faces)
(defface speedbar-separator-face '((((class color) (background light))
-
(
:background "blue"
-
:foreground "white"
-
:overline "gray")
)
+ :background "blue"
+ :foreground "white"
+
:overline "gray"
)
(((class color) (background dark))
(((class color) (background dark))
-
(
:background "blue"
-
:foreground "white"
-
:overline "gray")
)
+ :background "blue"
+ :foreground "white"
+
:overline "gray"
)
(((class grayscale monochrome)
(background light))
(((class grayscale monochrome)
(background light))
-
(
:background "black"
-
:foreground "white"
-
:overline "white")
)
+ :background "black"
+ :foreground "white"
+
:overline "white"
)
(((class grayscale monochrome)
(background dark))
(((class grayscale monochrome)
(background dark))
-
(
:background "white"
-
:foreground "black"
-
:overline "black")
))
- "
Face used
for separator labels in a display."
+ :background "white"
+ :foreground "black"
+
:overline "black"
))
+ "
Speedbar face
for separator labels in a display."
:group 'speedbar-faces)
;; some edebug hooks
:group 'speedbar-faces)
;; some edebug hooks