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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe2361c689525dbde88f0d27028676ba75f4ad4b..aae850d47a0ad140473287968f682098270640aa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,10 @@
 
        * 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>
 
        Sync with upstream vhdl mode v3.35.2.

diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index cb0c6bb1b72e8868864aa7725565f3762576524e..3d5a3980a94d51a8d2e798b4c9ae657d74a6ec2f 100644 (file)
--- 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