From: Chong Yidong Date: Mon, 3 Oct 2005 20:46:29 +0000 (+0000) Subject: * speedbar.el (speedbar-ignored-path-regexp, speedbar-line-path) X-Git-Tag: emacs-pretest-22.0.90~6842 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7752250e6bd5286daf8d99aa7c33c94a83eb96c1;p=emacs.git * speedbar.el (speedbar-ignored-path-regexp, speedbar-line-path) (speedbar-ignored-path-expressions, speedbar-buffers-line-path) (speedbar-add-ignored-path-regexp, speedbar-buffers-line-path) (speedbar-path-line): Define obsolete aliases. (speedbar-line-directory): Doc fix. * progmodes/vhdl-mode.el (vhdl-speedbar-initialize) (vhdl-speedbar-rescan-hierarchy): Call speedbar-line-directory instead of speedbar-line-path. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b595bb4c8df..423b77732fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2005-10-03 Chong Yidong + + * speedbar.el (speedbar-ignored-path-regexp, speedbar-line-path) + (speedbar-ignored-path-expressions, speedbar-buffers-line-path) + (speedbar-add-ignored-path-regexp, speedbar-buffers-line-path) + (speedbar-path-line): Define obsolete aliases. + (speedbar-line-directory): Doc fix. + + * progmodes/vhdl-mode.el (vhdl-speedbar-initialize) + (vhdl-speedbar-rescan-hierarchy): Call speedbar-line-directory + instead of speedbar-line-path. + 2005-10-03 Jan Dj,Ad(Brv * x-dnd.el (x-dnd-drop-data): Don't set dnd-open-file-other-window diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 1986148e8d5..8f2dcc7cf1f 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -13988,11 +13988,11 @@ if required." (speedbar-add-mode-functions-list '("vhdl directory" (speedbar-item-info . vhdl-speedbar-item-info) - (speedbar-line-path . speedbar-files-line-path))) + (speedbar-line-directory . speedbar-files-line-path))) (speedbar-add-mode-functions-list '("vhdl project" (speedbar-item-info . vhdl-speedbar-item-info) - (speedbar-line-path . vhdl-speedbar-line-project))) + (speedbar-line-directory . vhdl-speedbar-line-project))) ;; keymap (unless vhdl-speedbar-key-map (setq vhdl-speedbar-key-map (speedbar-make-specialized-keymap)) @@ -14257,9 +14257,9 @@ otherwise use cached data." ((save-excursion (beginning-of-line) (looking-at "[^0-9]")) (re-search-forward "[0-9]+:" nil t) (vhdl-scan-directory-contents - (abbreviate-file-name (speedbar-line-path)))) + (abbreviate-file-name (speedbar-line-directory)))) ;; current directory - (t (setq path (speedbar-line-path)) + (t (setq path (speedbar-line-directory)) (string-match "^\\(.+[/\\]\\)" path) (vhdl-scan-directory-contents (abbreviate-file-name (match-string 1 path))))) @@ -14977,7 +14977,7 @@ NO-POSITION non-nil means do not re-position cursor." (cond ((string-match "+" text) ; we have to expand this dir (setq speedbar-shown-directories (cons (expand-file-name - (concat (speedbar-line-path indent) token "/")) + (concat (speedbar-line-directory indent) token "/")) speedbar-shown-directories)) (speedbar-change-expand-button-char ?-) (speedbar-reset-scanners) @@ -14986,12 +14986,12 @@ NO-POSITION non-nil means do not re-position cursor." (end-of-line) (forward-char 1) (vhdl-speedbar-insert-dirs (speedbar-file-lists - (concat (speedbar-line-path indent) token "/")) + (concat (speedbar-line-directory indent) token "/")) (1+ indent)) (speedbar-reset-scanners) (vhdl-speedbar-insert-dir-hierarchy (abbreviate-file-name - (concat (speedbar-line-path indent) token "/")) + (concat (speedbar-line-directory indent) token "/")) (1+ indent) speedbar-power-click))) (vhdl-speedbar-update-current-unit t t)) ((string-match "-" text) ; we have to contract this node @@ -14999,7 +14999,7 @@ NO-POSITION non-nil means do not re-position cursor." (let ((oldl speedbar-shown-directories) (newl nil) (td (expand-file-name - (concat (speedbar-line-path indent) token)))) + (concat (speedbar-line-directory indent) token)))) (while oldl (if (not (string-match (concat "^" (regexp-quote td)) (car oldl))) (setq newl (cons (car oldl) newl))) @@ -15085,7 +15085,7 @@ NO-POSITION non-nil means do not re-position cursor." (if vhdl-speedbar-show-projects (vhdl-speedbar-line-project) (abbreviate-file-name - (file-name-as-directory (speedbar-line-path indent))))) + (file-name-as-directory (speedbar-line-directory indent))))) (defun vhdl-speedbar-line-project (&optional indent) "Get currently displayed project name." @@ -15236,7 +15236,7 @@ is already shown in a buffer." (unit-name (vhdl-speedbar-line-text)) (vhdl-project (vhdl-speedbar-line-project)) (directory (file-name-as-directory - (or (speedbar-line-file) (speedbar-line-path))))) + (or (speedbar-line-file) (speedbar-line-directory))))) (if (fboundp 'speedbar-select-attached-frame) (speedbar-select-attached-frame) (select-frame speedbar-attached-frame)) @@ -15248,7 +15248,7 @@ is already shown in a buffer." (interactive) (let ((vhdl-project (vhdl-speedbar-line-project)) (default-directory (file-name-as-directory - (or (speedbar-line-file) (speedbar-line-path))))) + (or (speedbar-line-file) (speedbar-line-directory))))) (vhdl-generate-makefile))) (defun vhdl-speedbar-check-unit (design-unit) diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 0978a31681e..cdb592a3944 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -3155,7 +3155,7 @@ Otherwise do not move and return nil." nil)))))) (defun speedbar-line-directory (&optional depth) - "Retrieve the directoryname associated with the current line. + "Retrieve the directory name associated with the current line. This may require traversing backwards from DEPTH and combining the default directory with these items. This function is replaceable in `speedbar-mode-functions-list' as `speedbar-line-directory'." @@ -4095,6 +4095,30 @@ TEXT is the buffer's name, TOKEN and INDENT are unused." ) ) + +;;; Obsolete variables and functions + +(define-obsolete-variable-alias + 'speedbar-ignored-path-regexp 'speedbar-ignored-directory-regexp) + +(define-obsolete-variable-alias 'speedbar-ignored-path-expressions + 'speedbar-ignored-directory-expressions) + +(define-obsolete-function-alias 'speedbar-add-ignored-path-regexp + 'speedbar-add-ignored-directory-regexp) + +(define-obsolete-function-alias 'speedbar-line-path + 'speedbar-line-directory) + +(define-obsolete-function-alias 'speedbar-buffers-line-path + 'speedbar-buffers-line-directory) + +(define-obsolete-function-alias 'speedbar-path-line + 'speedbar-directory-line) + +(define-obsolete-function-alias 'speedbar-buffers-line-path + 'speedbar-buffers-line-directory) + (provide 'speedbar) ;; run load-time hooks