[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 06/30: company-search-printing-char: Don't update company-search-
From: |
Dmitry Gutov |
Subject: |
[elpa] 06/30: company-search-printing-char: Don't update company-search-string when no match |
Date: |
Tue, 14 Oct 2014 22:22:45 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit c151e40d01a646f1d1ec6bbe1f5bc0441235dc9d
Author: Dmitry Gutov <address@hidden>
Date: Sun Sep 28 04:39:57 2014 +0400
company-search-printing-char: Don't update company-search-string when no
match
Fixes #194
---
company.el | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/company.el b/company.el
index 15a6eee..a721366 100644
--- a/company.el
+++ b/company.el
@@ -1575,14 +1575,12 @@ from the rest of the back-ends in the group, if any,
will be left at the end."
(defun company-search-printing-char ()
(interactive)
(company-search-assert-enabled)
- (setq company-search-string
- (concat (or company-search-string "") (string last-command-event))
- company-search-lighter (concat " Search: \"" company-search-string
- "\""))
- (let ((pos (company-search company-search-string
- (nthcdr company-selection company-candidates))))
+ (let* ((ss (concat company-search-string (string last-command-event)))
+ (pos (company-search ss (nthcdr company-selection
company-candidates))))
(if (null pos)
(ding)
+ (setq company-search-string ss
+ company-search-lighter (concat " Search: \"" ss "\""))
(company-set-selection (+ company-selection pos) t))))
(defun company-search-repeat-forward ()
- [elpa] branch master updated (a7fe5bb -> 0750e13), Dmitry Gutov, 2014/10/14
- [elpa] 01/30: Fix company-yasnippet compilation without yasnippet, Dmitry Gutov, 2014/10/14
- [elpa] 04/30: company-gtags: Don't try to complete in non-file buffers, Dmitry Gutov, 2014/10/14
- [elpa] 03/30: Merge pull request #191 from jorgenschaefer/master, Dmitry Gutov, 2014/10/14
- [elpa] 02/30: Use read-kbd-macro instead of kbd as a function., Dmitry Gutov, 2014/10/14
- [elpa] 06/30: company-search-printing-char: Don't update company-search-string when no match,
Dmitry Gutov <=
- [elpa] 05/30: company--insert-candidate: Don't use `insert-before-markers', Dmitry Gutov, 2014/10/14
- [elpa] 07/30: company-create-match-predicate: Just replace the predicate, Dmitry Gutov, 2014/10/14
- [elpa] 08/30: company-post-command: Handle being called after quitting, Dmitry Gutov, 2014/10/14
- [elpa] 09/30: company-files.el: Change regexp prefix, Dmitry Gutov, 2014/10/14
- [elpa] 10/30: Update docstring, change words, bump copyright year, Dmitry Gutov, 2014/10/14
- [elpa] 13/30: Update a comment, Dmitry Gutov, 2014/10/14
- [elpa] 11/30: company-files-complete: Include mtime in the cache key, Dmitry Gutov, 2014/10/14
- [elpa] 15/30: company-files: Fix cache behavior for when we're backspacing, Dmitry Gutov, 2014/10/14
- [elpa] 16/30: company-file--keys-match-p: Handle OLD being nil, Dmitry Gutov, 2014/10/14
- [elpa] 17/30: company-begin-commands: Add `orgtbl-self-insert-command', Dmitry Gutov, 2014/10/14