X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bd6406004f3c005b0ab1d3a5a98de9983e54d495..0578dead3a18ccc5419db3d1d5bb4db43165bd44:/lisp/speedbar.el diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 1ef7bde065..f8e9386585 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -185,7 +185,7 @@ ;; customization stuff (defgroup speedbar nil "File and tag browser frame." - :group 'tags + :group 'etags :group 'tools :group 'convenience :version "20.3") @@ -932,7 +932,7 @@ This basically creates a sparse keymap, and makes it's parent be (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,7 +981,7 @@ directories.") (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))))) @@ -1215,13 +1215,13 @@ Files are completely ignored if they match `speedbar-file-unshown-regexp' which is generated from `completion-ignored-extensions'. Files with a `*' character after their name are files checked out of a -version control system. (currently only RCS is supported.) New +version control system. (Currently only RCS is supported.) New version control systems can be added by examining the documentation -for `speedbar-this-file-in-vc' and `speedbar-vc-check-dir-p' +for `speedbar-this-file-in-vc' and `speedbar-vc-check-dir-p'. Files with a `#' or `!' character after them are source files that have an object file associated with them. The `!' indicates that the -files is out of date. You can control what source/object associations +files is out of date. You can control what source/object associations exist through the variable `speedbar-obj-alist'. Click on the [+] to display a list of tags from that file. Click on @@ -1676,7 +1676,7 @@ Assumes that the current buffer is the speedbar buffer." "Refresh the current speedbar display, disposing of any cached data." (interactive) (let ((dl speedbar-shown-directories) - (dm (and (boundp 'deactivate-mark) deactivate-mark))) + deactivate-mark) (while dl (adelete 'speedbar-directory-contents-alist (car dl)) (setq dl (cdr dl))) @@ -1687,8 +1687,7 @@ Assumes that the current buffer is the speedbar buffer." ;; Reset the timer in case it got really hosed for some reason... (speedbar-set-timer speedbar-update-speed) (if (<= 1 speedbar-verbosity-level) - (speedbar-message "Refreshing speedbar...done")) - (if (boundp 'deactivate-mark) (setq deactivate-mark dm)))) + (speedbar-message "Refreshing speedbar...done")))) (defun speedbar-item-load () "Load the item under the cursor or mouse if it is a Lisp file." @@ -2326,7 +2325,7 @@ position to insert a new item, and that the new item will end with a CR." (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 @@ -2640,7 +2639,7 @@ name will have the function FIND-FUN and not token." (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 @@ -3344,7 +3343,7 @@ directory with these items. This function is replaceable in `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 @@ -3411,7 +3410,9 @@ directory with these items." (if (re-search-forward "[]>?}] [^ ]" (save-excursion (end-of-line) (point)) t) - (speedbar-do-function-pointer) + (progn + (forward-char -1) + (speedbar-do-function-pointer)) nil)) (speedbar-do-function-pointer))) @@ -3428,12 +3429,12 @@ With universal argument ARG, flush cached data." (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) @@ -3554,7 +3555,7 @@ expanded. INDENT is the current indentation level." TEXT is the button clicked on. TOKEN is the directory to follow. INDENT is the current indentation level and is unused." (if (string-match "^[A-z]:$" token) - (setq default-directory (concat token (char-to-string directory-sep-char))) + (setq default-directory (concat token "/")) (setq default-directory token)) ;; Because we leave speedbar as the current buffer, ;; update contents will change directory without @@ -4175,10 +4176,10 @@ TEXT is the buffer's name, TOKEN and INDENT are unused." (:background "green")) (((class color) (background dark)) (:background "sea green")) - (((class grayscale monochrome) + (((class grayscale mono) (background light)) (:background "black")) - (((class grayscale monochrome) + (((class grayscale mono) (background dark)) (:background "white"))) "Face used for highlighting buttons with the mouse." @@ -4195,7 +4196,7 @@ TEXT is the buffer's name, TOKEN and INDENT are unused." (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. @@ -4340,4 +4341,5 @@ If we have an image associated with it, use that image." ;; run load-time hooks (run-hooks 'speedbar-load-hook) +;;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5 ;;; speedbar.el ends here