[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master ea5c4fd 05/66: More cleanup
From: |
Dmitry Gutov |
Subject: |
[elpa] master ea5c4fd 05/66: More cleanup |
Date: |
Tue, 13 Jan 2015 02:44:43 +0000 |
branch: master
commit ea5c4fde97706cd680b01324fe8638e8b183af77
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
More cleanup
---
company-cmake.el | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/company-cmake.el b/company-cmake.el
index 377c005..5e3b003 100644
--- a/company-cmake.el
+++ b/company-cmake.el
@@ -79,15 +79,16 @@ They affect which types of symbols we get completion
candidates for.")
;; If hash is empty, fill it.
(unless (gethash arg company-cmake--candidates-cache)
(with-temp-buffer
- (setq res (call-process company-cmake-executable nil t nil arg))
- (unless (eq 0 res)
- (message "cmake executable exited with error=%d" res))
+ (let ((res 0))
+ (setq res (call-process company-cmake-executable nil t nil arg))
+ (unless (eq 0 res)
+ (message "cmake executable exited with error=%d" res)))
(setq rlt (buffer-string)))
(setq rlt (company-cmake--replace-tags rlt))
(puthash arg rlt company-cmake--candidates-cache))
))
-(defun company-cmake-find-match (pattern line)
+(defun company-cmake--find-match (pattern line cmd)
(let (match)
;; General Flags
(if (string-match pattern line)
@@ -101,17 +102,15 @@ They affect which types of symbols we get completion
candidates for.")
(regexp-quote prefix)
(if (zerop (length prefix)) "+" "*")))
(lines (split-string content "\n"))
- (lang-patterns ())
match
rlt)
(dolist (line lines)
- (if (setq match (company-cmake-find-match pattern line))
+ (if (setq match (company-cmake--find-match pattern line cmd))
(push match rlt)))
rlt))
(defun company-cmake--candidates (prefix)
- (let ((res 0)
- results
+ (let (results
cmd-opts
str)
- [elpa] master 67ead1a 06/66: Bump the year, (continued)
- [elpa] master 67ead1a 06/66: Bump the year, Dmitry Gutov, 2015/01/12
- [elpa] master eb03746 09/66: company-cmake--unexpand-candidate: Remove extra underscore, Dmitry Gutov, 2015/01/12
- [elpa] master 28f8dc6 11/66: Update NEWS, Dmitry Gutov, 2015/01/12
- [elpa] master e5627dd 12/66: company-etags-file-table: Check that TAGS is not a directory, Dmitry Gutov, 2015/01/12
- [elpa] master e66f2c3 13/66: company-bbdb: Use the whole line content after `: ' as prefix, Dmitry Gutov, 2015/01/12
- [elpa] master 79d4b0d 10/66: company-cmake: Support G77/Fortran distinction, Dmitry Gutov, 2015/01/12
- [elpa] master 4375685 14/66: company-complete-number: Handle keypad events, Dmitry Gutov, 2015/01/12
- [elpa] master e692260 15/66: Show numbers in tooltip irrespective of scrolling, Dmitry Gutov, 2015/01/12
- [elpa] master c97666c 18/66: company-files--complete: Ignore case on appropriate systems, Dmitry Gutov, 2015/01/12
- [elpa] master 4d8ac8c 17/66: Support multiple-width chars in annotations, Dmitry Gutov, 2015/01/12
- [elpa] master ea5c4fd 05/66: More cleanup,
Dmitry Gutov <=
- [elpa] master b188c49 07/66: Inline company-cmake--find-match, Dmitry Gutov, 2015/01/12
- [elpa] master 556ee69 16/66: Bump the version for development, Dmitry Gutov, 2015/01/12
- [elpa] master ccc08c9 08/66: Eliminate one `setq', Dmitry Gutov, 2015/01/12
- [elpa] master ed86ad5 20/66: company-update-candidates: Fix WRT ignore-case, Dmitry Gutov, 2015/01/12
- [elpa] master abf95f7 19/66: company-update-candidates: Don't be fooled by a few prefix completions, Dmitry Gutov, 2015/01/12
- [elpa] master 98477e7 21/66: Reword comment, Dmitry Gutov, 2015/01/12
- [elpa] master 660cafc 22/66: company-input-noop: Use a symbol for the dummy event binding, Dmitry Gutov, 2015/01/12
- [elpa] master 7d3c5d4 23/66: company-backends: Clarify that responding to `match' is never mandatory, Dmitry Gutov, 2015/01/12
- [elpa] master bb0badd 25/66: Edit NEWS, Dmitry Gutov, 2015/01/12
- [elpa] master 67e74ce 26/66: company-backends: Add "to this command", Dmitry Gutov, 2015/01/12