[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 8f09f52 61/66: Replace `cl-plusp' usages with `string='
From: |
Dmitry Gutov |
Subject: |
[elpa] master 8f09f52 61/66: Replace `cl-plusp' usages with `string=' |
Date: |
Tue, 13 Jan 2015 02:45:08 +0000 |
branch: master
commit 8f09f52ec7b159c2f4dd988f5d87d8564e60641f
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Replace `cl-plusp' usages with `string='
---
company.el | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/company.el b/company.el
index cac3ca2..be94743 100644
--- a/company.el
+++ b/company.el
@@ -1595,10 +1595,10 @@ from the rest of the back-ends in the group, if any,
will be left at the end."
(company--search-update-string ss)))
(defun company--search-update-predicate (&optional ss)
- (or ss (setq ss company-search-string))
(let* ((company-candidates-predicate
- (when company-search-filtering
- (lambda (candidate) (string-match ss candidate))))
+ (and (not (string= ss ""))
+ company-search-filtering
+ (lambda (candidate) (string-match ss candidate))))
(cc (company-calculate-candidates company-prefix)))
(unless cc (error "No match"))
(company-update-candidates cc)))
@@ -1617,7 +1617,7 @@ from the rest of the back-ends in the group, if any, will
be left at the end."
(defun company--search-assert-input ()
(company--search-assert-enabled)
- (unless (cl-plusp (length company-search-string))
+ (when (string= company-search-string "")
(error "Empty search string")))
(defun company-search-repeat-forward ()
@@ -1668,7 +1668,7 @@ from the rest of the back-ends in the group, if any, will
be left at the end."
(defun company-search-delete-char ()
(interactive)
(company--search-assert-enabled)
- (when (cl-plusp (length company-search-string))
+ (unless (string= company-search-string "")
(let ((ss (substring company-search-string 0 -1)))
(when company-search-filtering
(company--search-update-predicate ss))
@@ -2182,7 +2182,7 @@ If SHOW-VERSION is non-nil, show the version in the echo
area."
mouse-face company-tooltip-mouse)
line))
(when selected
- (if (and (cl-plusp (length company-search-string))
+ (if (and (not (string= company-search-string ""))
(string-match (regexp-quote company-search-string) value
(length company-prefix)))
(let ((beg (+ margin (match-beginning 0)))
- [elpa] master 7b312dd 52/66: Introduce `company-search-toggle-filtering', (continued)
- [elpa] master 7b312dd 52/66: Introduce `company-search-toggle-filtering', Dmitry Gutov, 2015/01/12
- [elpa] master 0d2757c 56/66: company-search-map: Add M-n and M-p bindings, Dmitry Gutov, 2015/01/12
- [elpa] master f5942e9 55/66: company-fill-propertize: Don't highlight match beg till common part, Dmitry Gutov, 2015/01/12
- [elpa] master aa7c1ca 57/66: Simplify NEWS entry, Dmitry Gutov, 2015/01/12
- [elpa] master eb1f0db 58/66: Fixup a test, Dmitry Gutov, 2015/01/12
- [elpa] master 9c99c7c 60/66: company-search-abort: Move predicate reset to the mode function, Dmitry Gutov, 2015/01/12
- [elpa] master 31d352f 53/66: Update NEWS.md, Dmitry Gutov, 2015/01/12
- [elpa] master 559b4f2 49/66: Don't repeat search with empty string, Dmitry Gutov, 2015/01/12
- [elpa] master 388545b 54/66: Add company-complete-common-or-cycle, Dmitry Gutov, 2015/01/12
- [elpa] master 160ab01 63/66: Split company--process-candidates into -pre and -post, Dmitry Gutov, 2015/01/12
- [elpa] master 8f09f52 61/66: Replace `cl-plusp' usages with `string=',
Dmitry Gutov <=
- [elpa] master 5b0f1c8 62/66: company-search-delete-char: Use `ding', Dmitry Gutov, 2015/01/12
- [elpa] master 5ebcae8 64/66: Improve duplicates removal, Dmitry Gutov, 2015/01/12
- [elpa] master 770d0d8 59/66: Work around http://debbugs.gnu.org/19553, Dmitry Gutov, 2015/01/12
- [elpa] master eb0d8d9 65/66: Release 0.8.8, Dmitry Gutov, 2015/01/12
- [elpa] master a95c2ce 42/66: Reorganize tests layout, Dmitry Gutov, 2015/01/12
- [elpa] master 092486e 66/66: Merge commit 'eb0d8d9e687e1364098f9abc6f9281fcbc0d3abd' from company, Dmitry Gutov, 2015/01/12