[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 07/35: Drop support for `crop'
From: |
Dmitry Gutov |
Subject: |
[elpa] 07/35: Drop support for `crop' |
Date: |
Sat, 19 Apr 2014 10:12:14 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit 673177cdaad94a10834b0ab6f57d74fb72134021
Author: Dmitry Gutov <address@hidden>
Date: Sun Mar 30 06:51:06 2014 +0300
Drop support for `crop'
---
NEWS.md | 1 +
company.el | 20 ++++++--------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 76a960f..c206ee5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,7 @@
## Next
+* Support for back-end command `crop` dropped (it was never documented).
* Support for Emacs 23 dropped.
* New user option `company-abort-manual-when-too-short`.
diff --git a/company.el b/company.el
index 5a6d020..7398e80 100644
--- a/company.el
+++ b/company.el
@@ -983,20 +983,14 @@ can retrieve meta-data for them."
;; `company-complete-common'.
(setq company-common
(if (cdr company-candidates)
- (company--safe-candidate
- (let ((common (try-completion company-prefix
company-candidates)))
- (if (eq common t)
- ;; Mulple equal strings, probably with different
- ;; annotations.
- company-prefix
- common)))
+ (let ((common (try-completion company-prefix
company-candidates)))
+ (if (eq common t)
+ ;; Mulple equal strings, probably with different
+ ;; annotations.
+ company-prefix
+ common))
(car company-candidates)))))
-(defun company--safe-candidate (str)
- ;; XXX: This feature is deprecated.
- (or (company-call-backend 'crop str)
- str))
-
(defun company-calculate-candidates (prefix)
(let ((candidates (cdr (assoc prefix company-candidates-cache)))
(ignore-case (company-call-backend 'ignore-case)))
@@ -1653,8 +1647,6 @@ and invoke the normal binding."
(interactive)
(when (company-manual-begin)
(let ((result (nth company-selection company-candidates)))
- (when company--auto-completion
- (setq result (company--safe-candidate result)))
(company-finish result))))
(defun company-complete-common ()
- [elpa] branch master updated (0c8e3a1 -> 77719a9), Dmitry Gutov, 2014/04/19
- [elpa] 02/35: More robust and simpler logic in prefix test, Dmitry Gutov, 2014/04/19
- [elpa] 03/35: Test new prefix behavior, option company-abort-manual-when-too-short, Dmitry Gutov, 2014/04/19
- [elpa] 08/35: Use `condition-case-unless-debug', Dmitry Gutov, 2014/04/19
- [elpa] 04/35: Minor tweaks, Dmitry Gutov, 2014/04/19
- [elpa] 07/35: Drop support for `crop',
Dmitry Gutov <=
- [elpa] 10/35: Bump version, Dmitry Gutov, 2014/04/19
- [elpa] 09/35: Add Package-Requires header, Dmitry Gutov, 2014/04/19
- [elpa] 13/35: Make company-clang work asynchronously, Dmitry Gutov, 2014/04/19
- [elpa] 12/35: Remove `company-locate-dominating-file', Dmitry Gutov, 2014/04/19
- [elpa] 16/35: Update NEWS, Dmitry Gutov, 2014/04/19
- [elpa] 17/35: company--merge-async: tweak, Dmitry Gutov, 2014/04/19
- [elpa] 19/35: Move company-elisp require, Dmitry Gutov, 2014/04/19
- [elpa] 14/35: Implement async operation for grouped backends, Dmitry Gutov, 2014/04/19
- [elpa] 18/35: company--force-sync: change calling convention, Dmitry Gutov, 2014/04/19
- [elpa] 20/35: Change the summary, Dmitry Gutov, 2014/04/19