[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/last-cedet-merge 0a2b38b 26/50: EDE: Expand file n
From: |
David Engster |
Subject: |
[Emacs-diffs] scratch/last-cedet-merge 0a2b38b 26/50: EDE: Expand file name |
Date: |
Wed, 25 Jan 2017 22:15:22 +0000 (UTC) |
branch: scratch/last-cedet-merge
commit 0a2b38be2b1d311575b53dcee349ddd49e466871
Author: Eric Ludlam <address@hidden>
Commit: David Engster <address@hidden>
EDE: Expand file name
* lisp/cedet/ede/auto.el (ede-calc-fromconfig): Expand the found file
name.
---
lisp/cedet/ede/auto.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index a77de92..30419e8 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -65,10 +65,11 @@ into memory.")
(cl-defmethod ede-calc-fromconfig ((dirmatch ede-project-autoload-dirmatch))
"Calculate the value of :fromconfig from DIRMATCH."
- (let ((fc (oref dirmatch fromconfig)))
- (cond ((stringp fc) fc)
- ((functionp fc) (funcall fc))
- (t (error "Unknown dirmatch object match style.")))
+ (let* ((fc (oref dirmatch fromconfig))
+ (found (cond ((stringp fc) fc)
+ ((functionp fc) (funcall fc))
+ (t (error "Unknown dirmatch object match style.")))))
+ (expand-file-name found)
))
- [Emacs-diffs] scratch/last-cedet-merge 3cbb968 47/50: semantic: Use file name for grammar name instead of %package token, (continued)
- [Emacs-diffs] scratch/last-cedet-merge 3cbb968 47/50: semantic: Use file name for grammar name instead of %package token, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 6d6b045 27/50: EDE: Improve Emacs project type, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 64484cf 43/50: semantic: Set `semantic-type-relation-separator-character' for Emacs Lisp, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge e698dc1 04/50: semantic: Add support for typedef references, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 783fb86 46/50: semantic: Add 'fromfile' option to grammar package, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge d2a57bd 50/50: CEDET: Fix "unknown slot [...]" warnings, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge f11e08f 10/50: semantic: Fix wisent parser recursion, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge e4e864a 39/50: semantic: Properly create canonical name for C++ type tag, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 8571383 16/50: semantic: Incorporate local scope when finding type, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge ec4505d 17/50: semantic: Accept FLAGS in texinfo-mode for analyzing completions, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 0a2b38b 26/50: EDE: Expand file name,
David Engster <=
- [Emacs-diffs] scratch/last-cedet-merge 2b42323 35/50: EDE: Fix for project detection, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge cfd7139 28/50: semantic: Some C grammar optimizations, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 278c06c 31/50: semantic: Optimize 'typeformbase' in C grammar, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 8daca76 30/50: semantic: C grammar optimizations, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 74263b1 37/50: semantic: Change unary expression rule, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge cfc56f5 38/50: semantic: Fix for db-global, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge ebc8418 40/50: semantic: Check if slot is bound, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge b4bcc84 32/50: semantic: completion fixes, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge b893e8a 41/50: semantic: Allow empty type relation separation character, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 592b5fe 48/50: semantic: Improve C++ 'friend' parsing, David Engster, 2017/01/25