[elpa] 07/09: Fix error: GTAGSCONF must be absolute path name

[Leo Liu]

leoliu pushed a commit to branch master
in repository elpa.

commit f3eba3b05bf0ecf0bbe2d540161f10082ec50687
Author: Leo Liu <address@hidden>
Date:   Tue Feb 25 13:38:22 2014 +0800

    Fix error: GTAGSCONF must be absolute path name
    
    gtags complains if GTAGSCONF path contains ~, for example
    ~/projects/msc/.globalrc
---
 ggtags.el |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ggtags.el b/ggtags.el
index a58d5d6..d25da17 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -450,8 +450,8 @@ properly update `ggtags-mode-map'."
   (interactive "DRoot directory: ")
   (let ((process-environment process-environment))
     (when (zerop (length root)) (error "No root directory provided"))
-    (setenv "GTAGSROOT"
-            (directory-file-name (file-name-as-directory root)))
+    (setenv "GTAGSROOT" (expand-file-name
+                         (directory-file-name (file-name-as-directory root))))
     (ggtags-with-current-project
      (and (not (getenv "GTAGSLABEL"))
           (yes-or-no-p "Use `ctags' backend? ")
@@ -892,7 +892,7 @@ Global and Emacs."
                                (`"GTAGS"  '("definition" "definitions"))
                                (`"GSYMS"  '("symbol"     "symbols"))
                                (`"GRTAGS" '("reference"  "references"))
-                               (`"GPATH"  '("file"  "files"))
+                               (`"GPATH"  '("file"       "files"))
                                (`"ID"     '("identifier" "identifiers"))
                                (_         '("match"      "matches"))))))
           exit-status)))