[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 93aa472 064/173: Merge pull request #382 from ilohmar/etag
From: |
Dmitry Gutov |
Subject: |
[elpa] master 93aa472 064/173: Merge pull request #382 from ilohmar/etags-fix |
Date: |
Thu, 23 Jun 2016 00:28:38 +0000 (UTC) |
branch: master
commit 93aa472ebe851a920e2978b2eb342308ba15b976
Merge: c6af7d2 3aa806f
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Merge pull request #382 from ilohmar/etags-fix
company-etags-find-table: fix fallback tags file expansion
---
company-etags.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/company-etags.el b/company-etags.el
index 1c01c91..5ccbd1e 100644
--- a/company-etags.el
+++ b/company-etags.el
@@ -51,11 +51,13 @@ buffer automatically."
(defvar-local company-etags-buffer-table 'unknown)
(defun company-etags-find-table ()
- (let ((file (locate-dominating-file (or buffer-file-name
- default-directory)
- "TAGS")))
+ (let ((file (expand-file-name
+ "TAGS"
+ (locate-dominating-file (or buffer-file-name
+ default-directory)
+ "TAGS"))))
(when (and file (file-regular-p file))
- (list (expand-file-name file)))))
+ (list file))))
(defun company-etags-buffer-table ()
(or (and company-etags-use-main-table-list tags-table-list)
- [elpa] master d2ff1dc 046/173: company--begin-new: Call `company-cancel' in the unique case, (continued)
- [elpa] master d2ff1dc 046/173: company--begin-new: Call `company-cancel' in the unique case, Dmitry Gutov, 2016/06/22
- [elpa] master a053848 050/173: Sort alphabetically, to appease a test, Dmitry Gutov, 2016/06/22
- [elpa] master 25cf452 060/173: Don't start automatically during macro recording, Dmitry Gutov, 2016/06/22
- [elpa] master 7419d5f 058/173: Update the tests, Dmitry Gutov, 2016/06/22
- [elpa] master 8202638 041/173: Document ignore-case backend command, Dmitry Gutov, 2016/06/22
- [elpa] master d463642 062/173: company-etags-find-table: fix fallback tags file expansion, Dmitry Gutov, 2016/06/22
- [elpa] master 5f8e6eb 066/173: Merge pull request #397 from bremner/make-elpa-fix, Dmitry Gutov, 2016/06/22
- [elpa] master 6e88174 053/173: Don't cut off the last character from a wrapped line, Dmitry Gutov, 2016/06/22
- [elpa] master 1079d1a 057/173: Use cl-labels instead of cl-flet, for cl-lib shim compatibility, Dmitry Gutov, 2016/06/22
- [elpa] master 3aa806f 063/173: company-etags-find-table: check that TAGS is a regular file, cf. #222, Dmitry Gutov, 2016/06/22
- [elpa] master 93aa472 064/173: Merge pull request #382 from ilohmar/etags-fix,
Dmitry Gutov <=
- [elpa] master 46d4455 071/173: Merge pull request #402 from vspinu/sorted, Dmitry Gutov, 2016/06/22
- [elpa] master 050c0c1 070/173: Improvements of the `company-backends` docstring, Dmitry Gutov, 2016/06/22
- [elpa] master 4646d35 078/173: Allow advising company-dabbrev(-code)? regex generation, Dmitry Gutov, 2016/06/22
- [elpa] master ed3e711 084/173: company-yasnippet: Disable cache (#422), Dmitry Gutov, 2016/06/22
- [elpa] master 7d14350 051/173: company-eclim-executable: Pick up the value of eclim-executable, if present, Dmitry Gutov, 2016/06/22
- [elpa] master 9e66366 067/173: Fix #404 by blanking out line-prefix again, Dmitry Gutov, 2016/06/22
- [elpa] master 433ae92 072/173: Retouch the docstring further, Dmitry Gutov, 2016/06/22
- [elpa] master 02d0e74 074/173: Modernize the Commentary a bit, Dmitry Gutov, 2016/06/22
- [elpa] master 7d005c4 080/173: Document some company-grab- functions, Dmitry Gutov, 2016/06/22
- [elpa] master 07a4e9e 094/173: Travis: Try to fix the "held broken packages", Dmitry Gutov, 2016/06/22