leoliu pushed a commit to branch master
in repository elpa.
commit fedbbf3debb56192295b0e372e298553cb0d45c8
Author: Leo Liu <sdl....@gmail.com>
Date: Thu Mar 6 22:46:35 2014 +0800
Make last change acutally work
---
ggtags.el | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ggtags.el b/ggtags.el
index 7ba1de2..2ecaa29 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -506,9 +506,10 @@ source trees. See Info node `(global)gtags' for details."
(directory-file-name (file-name-as-directory root))))
(ggtags-with-current-project
(let ((conf (and ggtags-use-project-gtagsconf
- (or (and (file-exists-p ".globalrc") ".globalrc")
- (and (file-exists-p "gtags.conf") "gtags.conf")))))
- (cond (conf (setenv "GTAGSCONF" (expand-file-name conf)))
+ (loop for name in '(".globalrc" "gtags.conf")
+ for full = (expand-file-name name root)
+ thereis (and (file-exists-p full) full)))))
+ (cond (conf (setenv "GTAGSCONF" conf))
((and (not (getenv "GTAGSLABEL"))
(yes-or-no-p "Use `ctags' backend? "))
(setenv "GTAGSLABEL" "ctags"))))
