[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ELPA-diffs] [elpa] 09/14: company-capf: Perform sorting before prefix a
From: |
emacs-devel |
Subject: |
[ELPA-diffs] [elpa] 09/14: company-capf: Perform sorting before prefix adjustment |
Date: |
Tue, 14 Jan 2014 20:57:11 +0000 |
This is an automated email from the git hooks/post-receive script.
root pushed a commit to branch master
in repository elpa.
commit 8ecec3594931ae8e2329fec4b793ad4ba392e4ef
Author: Dmitry Gutov <address@hidden>
Date: Mon Jan 6 07:53:07 2014 +0400
company-capf: Perform sorting before prefix adjustment
---
company-capf.el | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/company-capf.el b/company-capf.el
index ee2ac1e..6dcd87b 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -54,13 +54,14 @@ Requires Emacs 24.1 or newer."
(sortfun (cdr (assq 'display-sort-function meta)))
(boundaries (completion-boundaries arg table pred ""))
(candidates (all-completions arg table pred)))
- (unless (zerop (car boundaries))
- (let ((before (substring arg 0 (car boundaries))))
- (setq candidates
- (mapcar (lambda (candidate)
- (concat before candidate))
- candidates))))
- (if sortfun (funcall sortfun candidates) candidates)))))
+ (when sortfun
+ (setq candidates (funcall sortfun candidates)))
+ (if (not (zerop (car boundaries)))
+ (let ((before (substring arg 0 (car boundaries))))
+ (mapcar (lambda (candidate)
+ (concat before candidate))
+ candidates))
+ candidates)))))
(`sorted
(let ((res (company--capf-data)))
(when res
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
- [ELPA-diffs] [elpa] branch master updated (25219bd -> e6d8543), emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 10/14: * packages/company/company-etags.el: Require `cl' for `case'. * packages/company/company-oddmuse.el: Avoid `eval-when'., emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 02/14: Add option to wrap around selection in popup, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 01/14: Include emacs22 in the Travis build again, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 03/14: company-elisp: enable in inferior-emacs-lisp-mode, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 05/14: Fix #43, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 09/14: company-capf: Perform sorting before prefix adjustment,
emacs-devel <=
- [ELPA-diffs] [elpa] 04/14: company--should-complete: Don't check if we're in minibuffer, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 08/14: Fix http://debbugs.gnu.org/16334, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 06/14: Require cl before using cl, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 11/14: Replace company-elisp with company-capf, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 13/14: Fix a broken test, remove a duplicate one, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 12/14: Close #45, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 07/14: Merge pull request #44 from dcolascione/master, emacs-devel, 2014/01/14
- [ELPA-diffs] [elpa] 14/14: Merge commit '67a96dbbfe645b64291ed62eab6f1eb391a834e0' from company, emacs-devel, 2014/01/14