Deprecate company-nxml too

company-mode · Feb 26, 2018 · a64d52c · a64d52c
1 parent fc81e99
commit a64d52c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -4,6 +4,7 @@
 
 * In Emacs 26 and newer, `company-css` is removed from `company-backends`.
   `company-capf` is used instead.
+* Same for `company-nxml`.
 
 ## 2018-02-23 (0.9.6)
 

diff --git a/company-capf.el b/company-capf.el
@@ -24,8 +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 and
-;; css-mode.
+;; that defines a proper completion function, including emacs-lisp-mode,
+;; css-mode and nxml-mode.
 
 ;;; Code:
 

diff --git a/company-css.el b/company-css.el
@@ -21,7 +21,7 @@
 
 ;;; Commentary:
 ;;
-;; In newer versions of Emacs, company-capf is used instead.
+;; In Emacs >= 26, company-capf is used instead.
 
 ;;; Code:
 

diff --git a/company-nxml.el b/company-nxml.el
@@ -1,6 +1,6 @@
 ;;; company-nxml.el --- company-mode completion backend for nxml-mode
 
-;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2013, 2018  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -22,6 +22,7 @@
 
 ;;; Commentary:
 ;;
+;; In Emacs >= 26, company-capf is used instead.
 
 ;;; Code:
 

diff --git a/company.el b/company.el
@@ -322,7 +322,8 @@ 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
+                              ,@(unless (version<= "26" emacs-version)
+                                  (list 'company-nxml))
                               ,@(unless (version<= "26" emacs-version)
                                   (list 'company-css))
                               company-eclim company-semantic company-clang