[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ELPA-diffs] [elpa] 11/14: Replace company-elisp with company-capf
From: |
emacs-devel |
Subject: |
[ELPA-diffs] [elpa] 11/14: Replace company-elisp with company-capf |
Date: |
Tue, 14 Jan 2014 20:57:13 +0000 |
This is an automated email from the git hooks/post-receive script.
root pushed a commit to branch master
in repository elpa.
commit 55caaa4a05781354d6bb81005f7f25dad99d7933
Author: Dmitry Gutov <address@hidden>
Date: Tue Jan 14 06:45:32 2014 +0200
Replace company-elisp with company-capf
---
NEWS.md | 2 ++
company-capf.el | 11 ++++++++---
company.el | 8 +++++++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index ae1124c..fe9ddf7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,8 @@
## Next
+* Starting with Emacs version 24.4, `company-capf` is included in
+ `company-backends` and replaces `company-elisp`.
* `company-capf` supports completion tables that return non-default boundaries.
* `company-elisp` is enabled in `inferior-emacs-lisp-mode`.
diff --git a/company-capf.el b/company-capf.el
index 6dcd87b..0d68562 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -25,10 +25,15 @@
;;; Code:
+(eval-when-compile (require 'cl))
+
(defun company--capf-data ()
- (let ((data (run-hook-wrapped 'completion-at-point-functions
- ;; Ignore misbehaving functions.
- #'completion--capf-wrapper 'optimist)))
+ ;; Ignore tags-completion-at-point-function because it subverts company-etags
+ ;; in the default value of company-backends, where the latter comes later.
+ (letf* (((default-value 'completion-at-point-functions) nil)
+ (data (run-hook-wrapped 'completion-at-point-functions
+ ;; Ignore misbehaving functions.
+ #'completion--capf-wrapper 'optimist)))
(when (consp data) data)))
(defun company-capf (command &optional arg &rest _args)
diff --git a/company.el b/company.el
index 0d3bb38..5f9d6e1 100644
--- a/company.el
+++ b/company.el
@@ -243,9 +243,15 @@ If this many lines are not available, prefer to display
the tooltip above."
(assq backend company-safe-backends))
(return t))))))
-(defcustom company-backends '(company-elisp company-nxml company-css
+(defvar company--include-capf (version< "24.3.50" emacs-version))
+
+(defcustom company-backends `(,@(unless company--include-capf
+ (list 'company-elisp))
+ company-nxml company-css
company-eclim company-semantic company-clang
company-xcode company-ropemacs company-cmake
+ ,@(when company--include-capf
+ (list 'company-capf))
(company-gtags company-etags company-dabbrev-code
company-keywords)
company-oddmuse company-files company-dabbrev)
--
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, 2014/01/14
- [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 <=
- [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