branch: master
commit fc81e999ef5e56991fdba5944066da98baebb718
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
Deprecate company-css
Closes #708
---
NEWS.md | 5 +++++
company-capf.el | 3 ++-
company-css.el | 4 +++-
company.el | 4 +++-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 520766f..19e1fe2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
# History of user-visible changes
+## Next
+
+* In Emacs 26 and newer, `company-css` is removed from `company-backends`.
+ `company-capf` is used instead.
+
## 2018-02-23 (0.9.6)
* Workaround for Emacs' ([bug#23980](https://debbugs.gnu.org/23980)) triggered
diff --git a/company-capf.el b/company-capf.el
index 2a9b191..653243f 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -24,7 +24,8 @@
;;
;; The CAPF back-end provides a bridge to the standard
;; completion-at-point-functions facility, and thus can support any major mode
-;; that defines a proper completion function, including emacs-lisp-mode.
+;; that defines a proper completion function, including emacs-lisp-mode and
+;; css-mode.
;;; Code:
diff --git a/company-css.el b/company-css.el
index cf8c683..129cc51 100644
--- a/company-css.el
+++ b/company-css.el
@@ -1,6 +1,6 @@
;;; company-css.el --- company-mode completion backend for css-mode -*-
lexical-binding: t -*-
-;; Copyright (C) 2009, 2011, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2011, 2014, 2018 Free Software Foundation, Inc.
;; Author: Nikolaj Schumacher
@@ -20,6 +20,8 @@
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
+;;
+;; In newer versions of Emacs, company-capf is used instead.
;;; Code:
diff --git a/company.el b/company.el
index 13481db..fc5c18f 100644
--- a/company.el
+++ b/company.el
@@ -322,7 +322,9 @@ This doesn't include the margins and the scroll bar."
(defcustom company-backends `(,@(unless (version< "24.3.51" emacs-version)
(list 'company-elisp))
company-bbdb
- company-nxml company-css
+ company-nxml
+ ,@(unless (version<= "26" emacs-version)
+ (list 'company-css))
company-eclim company-semantic company-clang
company-xcode company-cmake
company-capf
