diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-03-30 17:49:05 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-03-30 17:49:05 -0700 |
| commit | 1db854ccdd81811709b10b6793730e0dd1960021 (patch) | |
| tree | 1324148e9e27cfa7f87724bae07dd62a7718fc8a /lisp/progmodes/vhdl-mode.el | |
| parent | 4f3a895b33178230e27d5ad2fb81d5a3f5aa5d9e (diff) | |
| download | emacs-1db854ccdd81811709b10b6793730e0dd1960021.tar.gz | |
Sync some vhdl changes that seem to have been missed from some previous merge
* lisp/progmodes/vhdl-mode.el (vhdl-speedbar-select-mra)
(vhdl-compose-components-package, vhdl-compose-configuration):
Abbreviate default-directory.
Diffstat (limited to 'lisp/progmodes/vhdl-mode.el')
| -rw-r--r-- | lisp/progmodes/vhdl-mode.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index cb0c6bb1b72..3d5a3980a94 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -15859,8 +15859,10 @@ is already shown in a buffer." (error "ERROR: No architecture under cursor") (let* ((arch-key (downcase (vhdl-speedbar-line-text))) (ent-key (downcase (vhdl-speedbar-higher-text))) - (ent-alist (vhdl-aget vhdl-entity-alist - (or (vhdl-project-p) default-directory) t)) + (ent-alist (vhdl-aget + vhdl-entity-alist + (or (vhdl-project-p) + (abbreviate-file-name default-directory)) t)) (ent-entry (vhdl-aget ent-alist ent-key t))) (setcar (cddr (cddr ent-entry)) arch-key) ; (nth 4 ent-entry) (speedbar-refresh)))) @@ -16533,7 +16535,8 @@ current project/directory." (concat (vhdl-replace-string vhdl-package-file-name pack-name t) "." (file-name-extension (buffer-file-name)))) (ent-alist (vhdl-aget vhdl-entity-alist - (or project default-directory) t)) + (or project + (abbreviate-file-name default-directory)) t)) (lazy-lock-minimum-size 0) clause-pos component-pos) (message "Generating components package \"%s\"..." pack-name) @@ -16691,9 +16694,11 @@ current project/directory." (interactive) (vhdl-require-hierarchy-info) (let ((ent-alist (vhdl-aget vhdl-entity-alist - (or (vhdl-project-p) default-directory) t)) + (or (vhdl-project-p) + (abbreviate-file-name default-directory)) t)) (conf-alist (vhdl-aget vhdl-config-alist - (or (vhdl-project-p) default-directory) t)) + (or (vhdl-project-p) + (abbreviate-file-name default-directory)) t)) (from-speedbar ent-name) inst-alist conf-name conf-file-name pos) (vhdl-prepare-search-2 |