[Emacs-diffs] Changes to emacs/lisp/progmodes/vhdl-mode.el

[Chong Yidong]

Index: emacs/lisp/progmodes/vhdl-mode.el
diff -c emacs/lisp/progmodes/vhdl-mode.el:1.47 
emacs/lisp/progmodes/vhdl-mode.el:1.48
*** emacs/lisp/progmodes/vhdl-mode.el:1.47      Thu Sep 29 22:58:48 2005
--- emacs/lisp/progmodes/vhdl-mode.el   Mon Oct  3 20:46:29 2005
***************
*** 13988,13998 ****
      (speedbar-add-mode-functions-list
       '("vhdl directory"
         (speedbar-item-info . vhdl-speedbar-item-info)
!        (speedbar-line-path . 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)))
      ;; keymap
      (unless vhdl-speedbar-key-map
        (setq vhdl-speedbar-key-map (speedbar-make-specialized-keymap))
--- 13988,13998 ----
      (speedbar-add-mode-functions-list
       '("vhdl directory"
         (speedbar-item-info . vhdl-speedbar-item-info)
!        (speedbar-line-directory . speedbar-files-line-path)))
      (speedbar-add-mode-functions-list
       '("vhdl project"
         (speedbar-item-info . vhdl-speedbar-item-info)
!        (speedbar-line-directory . vhdl-speedbar-line-project)))
      ;; keymap
      (unless vhdl-speedbar-key-map
        (setq vhdl-speedbar-key-map (speedbar-make-specialized-keymap))
***************
*** 14257,14265 ****
       ((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))))
       ;; current directory
!      (t (setq path (speedbar-line-path))
        (string-match "^\\(.+[/\\]\\)" path)
        (vhdl-scan-directory-contents
         (abbreviate-file-name (match-string 1 path)))))
--- 14257,14265 ----
       ((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-directory))))
       ;; current directory
!      (t (setq path (speedbar-line-directory))
        (string-match "^\\(.+[/\\]\\)" path)
        (vhdl-scan-directory-contents
         (abbreviate-file-name (match-string 1 path)))))
***************
*** 14977,14983 ****
    (cond ((string-match "+" text)      ; we have to expand this dir
         (setq speedbar-shown-directories
               (cons (expand-file-name
!                     (concat (speedbar-line-path indent) token "/"))
                     speedbar-shown-directories))
         (speedbar-change-expand-button-char ?-)
         (speedbar-reset-scanners)
--- 14977,14983 ----
    (cond ((string-match "+" text)      ; we have to expand this dir
         (setq speedbar-shown-directories
               (cons (expand-file-name
!                     (concat (speedbar-line-directory indent) token "/"))
                     speedbar-shown-directories))
         (speedbar-change-expand-button-char ?-)
         (speedbar-reset-scanners)
***************
*** 14986,14997 ****
             (end-of-line) (forward-char 1)
             (vhdl-speedbar-insert-dirs
              (speedbar-file-lists
!              (concat (speedbar-line-path indent) token "/"))
              (1+ indent))
             (speedbar-reset-scanners)
             (vhdl-speedbar-insert-dir-hierarchy
              (abbreviate-file-name
!              (concat (speedbar-line-path indent) token "/"))
              (1+ indent) speedbar-power-click)))
         (vhdl-speedbar-update-current-unit t t))
        ((string-match "-" text)        ; we have to contract this node
--- 14986,14997 ----
             (end-of-line) (forward-char 1)
             (vhdl-speedbar-insert-dirs
              (speedbar-file-lists
!              (concat (speedbar-line-directory indent) token "/"))
              (1+ indent))
             (speedbar-reset-scanners)
             (vhdl-speedbar-insert-dir-hierarchy
              (abbreviate-file-name
!              (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,15005 ****
         (let ((oldl speedbar-shown-directories)
               (newl nil)
               (td (expand-file-name
!                   (concat (speedbar-line-path indent) token))))
           (while oldl
             (if (not (string-match (concat "^" (regexp-quote td)) (car oldl)))
                 (setq newl (cons (car oldl) newl)))
--- 14999,15005 ----
         (let ((oldl speedbar-shown-directories)
               (newl nil)
               (td (expand-file-name
!                   (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,15091 ****
    (if vhdl-speedbar-show-projects
        (vhdl-speedbar-line-project)
      (abbreviate-file-name
!      (file-name-as-directory (speedbar-line-path indent)))))
  
  (defun vhdl-speedbar-line-project (&optional indent)
    "Get currently displayed project name."
--- 15085,15091 ----
    (if vhdl-speedbar-show-projects
        (vhdl-speedbar-line-project)
      (abbreviate-file-name
!      (file-name-as-directory (speedbar-line-directory indent)))))
  
  (defun vhdl-speedbar-line-project (&optional indent)
    "Get currently displayed project name."
***************
*** 15236,15242 ****
          (unit-name (vhdl-speedbar-line-text))
          (vhdl-project (vhdl-speedbar-line-project))
          (directory (file-name-as-directory
!                     (or (speedbar-line-file) (speedbar-line-path)))))
        (if (fboundp 'speedbar-select-attached-frame)
          (speedbar-select-attached-frame)
        (select-frame speedbar-attached-frame))
--- 15236,15242 ----
          (unit-name (vhdl-speedbar-line-text))
          (vhdl-project (vhdl-speedbar-line-project))
          (directory (file-name-as-directory
!                     (or (speedbar-line-file) (speedbar-line-directory)))))
        (if (fboundp 'speedbar-select-attached-frame)
          (speedbar-select-attached-frame)
        (select-frame speedbar-attached-frame))
***************
*** 15248,15254 ****
    (interactive)
    (let ((vhdl-project (vhdl-speedbar-line-project))
        (default-directory (file-name-as-directory
!                           (or (speedbar-line-file) (speedbar-line-path)))))
      (vhdl-generate-makefile)))
  
  (defun vhdl-speedbar-check-unit (design-unit)
--- 15248,15254 ----
    (interactive)
    (let ((vhdl-project (vhdl-speedbar-line-project))
        (default-directory (file-name-as-directory
!                           (or (speedbar-line-file) 
(speedbar-line-directory)))))
      (vhdl-generate-makefile)))
  
  (defun vhdl-speedbar-check-unit (design-unit)