diff options
author | Eli Zaretskii <eliz@gnu.org> | 2015-05-04 17:46:30 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2015-05-04 17:46:30 +0300 |
commit | 8c392682fc9938b2ee02cc2741bf6f680281b0c7 (patch) | |
tree | a7f9d2820d72e43fd77d18299cb88b7701ae420a /lisp/cedet/semantic/bovine/gcc.el | |
parent | 5d3940a3b9144efbc4db4a7b76a3331cebc64165 (diff) | |
download | emacs-8c392682fc9938b2ee02cc2741bf6f680281b0c7.tar.gz emacs-8c392682fc9938b2ee02cc2741bf6f680281b0c7.tar.bz2 emacs-8c392682fc9938b2ee02cc2741bf6f680281b0c7.zip |
Fix minor issues with CEDET on MS-Windows
* lisp/cedet/semantic/symref/idutils.el
(semantic-symref-parse-tool-output-one-line): Fix the search
regexp to match MS-Windows file names with drive letters.
(Bug#19468)
* lisp/cedet/semantic/symref/grep.el
(semantic-symref-grep-use-template): Remove "--color=always" from
Grep switches on MS-Windows.
(semantic-symref-grep-shell): Use shell-file-name as the default
value, so this works not only on Posix platforms.
(semantic-symref-perform-search): Use shell-quote-argument instead
of literal '..' for portable quoting of Grep command-line
argument. Use shell-command-switch instead of a literal "-c".
* lisp/cedet/semantic/bovine/gcc.el
(semantic-gcc-get-include-paths): Use file-name-absolute-p to test
for an absolute file name in a portable way.
Diffstat (limited to 'lisp/cedet/semantic/bovine/gcc.el')
-rw-r--r-- | lisp/cedet/semantic/bovine/gcc.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el index 19d149112c6..b186e7bd6ee 100644 --- a/lisp/cedet/semantic/bovine/gcc.el +++ b/lisp/cedet/semantic/bovine/gcc.el @@ -86,13 +86,11 @@ to give to the program." (let ((chars (append line nil))) (when (= 32 (nth 0 chars)) (let ((path (substring line 1))) - (when (file-accessible-directory-p path) - (when (if (memq system-type '(windows-nt)) - (/= ?/ (nth 1 chars)) - (= ?/ (nth 1 chars))) - (add-to-list 'inc-path - (expand-file-name (substring line 1)) - t))))))))) + (when (and (file-accessible-directory-p path) + (file-name-absolute-p path)) + (add-to-list 'inc-path + (expand-file-name path) + t)))))))) inc-path)) |