Commit 1db854cc authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 4f3a895b
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
   
* simple.el (cycle-spacing--context, cycle-spacing): Doc tweaks. * simple.el (cycle-spacing--context, cycle-spacing): Doc tweaks.
   
* progmodes/vhdl-mode.el (vhdl-speedbar-select-mra)
(vhdl-compose-components-package, vhdl-compose-configuration):
Abbreviate default-directory (missing from some previous upstream sync).
2014-03-31 Reto Zimmermann <reto@gnu.org> 2014-03-31 Reto Zimmermann <reto@gnu.org>
   
Sync with upstream vhdl mode v3.35.2. Sync with upstream vhdl mode v3.35.2.
......
...@@ -15859,8 +15859,10 @@ is already shown in a buffer." ...@@ -15859,8 +15859,10 @@ is already shown in a buffer."
(error "ERROR: No architecture under cursor") (error "ERROR: No architecture under cursor")
(let* ((arch-key (downcase (vhdl-speedbar-line-text))) (let* ((arch-key (downcase (vhdl-speedbar-line-text)))
(ent-key (downcase (vhdl-speedbar-higher-text))) (ent-key (downcase (vhdl-speedbar-higher-text)))
(ent-alist (vhdl-aget vhdl-entity-alist (ent-alist (vhdl-aget
(or (vhdl-project-p) default-directory) t)) vhdl-entity-alist
(or (vhdl-project-p)
(abbreviate-file-name default-directory)) t))
(ent-entry (vhdl-aget ent-alist ent-key t))) (ent-entry (vhdl-aget ent-alist ent-key t)))
(setcar (cddr (cddr ent-entry)) arch-key) ; (nth 4 ent-entry) (setcar (cddr (cddr ent-entry)) arch-key) ; (nth 4 ent-entry)
(speedbar-refresh)))) (speedbar-refresh))))
...@@ -16533,7 +16535,8 @@ current project/directory." ...@@ -16533,7 +16535,8 @@ current project/directory."
(concat (vhdl-replace-string vhdl-package-file-name pack-name t) (concat (vhdl-replace-string vhdl-package-file-name pack-name t)
"." (file-name-extension (buffer-file-name)))) "." (file-name-extension (buffer-file-name))))
(ent-alist (vhdl-aget vhdl-entity-alist (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) (lazy-lock-minimum-size 0)
clause-pos component-pos) clause-pos component-pos)
(message "Generating components package \"%s\"..." pack-name) (message "Generating components package \"%s\"..." pack-name)
...@@ -16691,9 +16694,11 @@ current project/directory." ...@@ -16691,9 +16694,11 @@ current project/directory."
(interactive) (interactive)
(vhdl-require-hierarchy-info) (vhdl-require-hierarchy-info)
(let ((ent-alist (vhdl-aget vhdl-entity-alist (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 (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) (from-speedbar ent-name)
inst-alist conf-name conf-file-name pos) inst-alist conf-name conf-file-name pos)
(vhdl-prepare-search-2 (vhdl-prepare-search-2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment