diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-01-15 15:39:40 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-01-15 15:39:40 +0000 |
| commit | a3fa5c7f1b5e2ba4d6ec033dc0e2376326b05824 (patch) | |
| tree | a6082d4d1d1e9ddaea09a6a04bb4a47da95d642d /utils/clang-completion-mode.el | |
| parent | bb1e3bc1e0be2b8f891db46457a8943451bf4d8b (diff) | |
| download | FreeBSD-src-a3fa5c7f1b5e2ba4d6ec033dc0e2376326b05824.zip FreeBSD-src-a3fa5c7f1b5e2ba4d6ec033dc0e2376326b05824.tar.gz | |
Update clang to r93512.
Diffstat (limited to 'utils/clang-completion-mode.el')
| -rw-r--r-- | utils/clang-completion-mode.el | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/utils/clang-completion-mode.el b/utils/clang-completion-mode.el index 4164eac..873127f 100644 --- a/utils/clang-completion-mode.el +++ b/utils/clang-completion-mode.el @@ -144,12 +144,21 @@ This variable will typically contain include paths, e.g., -I~/MyProject." )))) (defun clang-complete () - (let ((ccstring (concat (buffer-file-name) - ":" - (number-to-string (+ 1 (current-line))) - ":" - (number-to-string (+ 1 (current-column))))) - (cc-buffer-name (concat "*Clang Completion for " (buffer-name) "*"))) + (let* ((cc-point (concat (buffer-file-name) + ":" + (number-to-string (+ 1 (current-line))) + ":" + (number-to-string (+ 1 (current-column))))) + (cc-pch (if (equal clang-completion-prefix-header "") nil + (list "-include-pch" + (concat clang-completion-prefix-header ".pch")))) + (cc-flags (if (listp clang-flags) clang-flags nil)) + (cc-command (append `(,clang "-cc1" "-fsyntax-only") + cc-flags + cc-pch + `("-code-completion-at" ,cc-point) + (list (buffer-file-name)))) + (cc-buffer-name (concat "*Clang Completion for " (buffer-name) "*"))) ;; Start the code-completion process (if (buffer-file-name) (progn @@ -162,18 +171,9 @@ This variable will typically contain include paths, e.g., -I~/MyProject." (setq clang-result-string "") (setq clang-completion-buffer cc-buffer-name) - (let ((cc-proc - (if (equal clang-completion-prefix-header "") - (start-process "Clang Code-Completion" cc-buffer-name - clang "-cc1" "-fsyntax-only" - "-code-completion-at" ccstring - (buffer-file-name)) - (start-process "Clang Code-Completion" cc-buffer-name - clang "-cc1" "-fsyntax-only" - "-code-completion-at" ccstring - "-include-pch" - (concat clang-completion-prefix-header ".pch") - (buffer-file-name))))) + (let ((cc-proc (apply 'start-process + (append (list "Clang Code-Completion" cc-buffer-name) + cc-command)))) (set-process-filter cc-proc 'clang-completion-stash-filter) (set-process-sentinel cc-proc 'clang-completion-sentinel) ))))) |
