[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a64d52c 05/66: Deprecate company-nxml too
From: |
Dmitry Gutov |
Subject: |
[elpa] master a64d52c 05/66: Deprecate company-nxml too |
Date: |
Mon, 5 Nov 2018 18:19:12 -0500 (EST) |
branch: master
commit a64d52ca033208cda34f2fb7d0a2f951cce8bd29
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Deprecate company-nxml too
---
NEWS.md | 1 +
company-capf.el | 4 ++--
company-css.el | 2 +-
company-nxml.el | 3 ++-
company.el | 3 ++-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 19e1fe2..2b25bbb 100644
--- 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
index 653243f..5d174a3 100644
--- 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
index 129cc51..2619def 100644
--- 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
index 5afa00e..36ff1ce 100644
--- 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
index fc5c18f..a694a65 100644
--- 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
- [elpa] master e72dfad 03/66: copyright-update, (continued)
- [elpa] master e72dfad 03/66: copyright-update, Dmitry Gutov, 2018/11/05
- [elpa] master 2a21bfd 01/66: Extract company--capf-post-completion, for easier debugging, Dmitry Gutov, 2018/11/05
- [elpa] master 0dc6945 08/66: Fix the build, Dmitry Gutov, 2018/11/05
- [elpa] master fc81e99 04/66: Deprecate company-css, Dmitry Gutov, 2018/11/05
- [elpa] master 1646a10 16/66: Always get candidates with prefix string in `company-diag`., Dmitry Gutov, 2018/11/05
- [elpa] master 07c56b1 12/66: Add NEWS entry, Dmitry Gutov, 2018/11/05
- [elpa] master 0afe18d 09/66: Allow CMake completion in strings when inside ${...}, Dmitry Gutov, 2018/11/05
- [elpa] master 67650de 17/66: Merge pull request #769 from tigersoldier/master, Dmitry Gutov, 2018/11/05
- [elpa] master 23e6c82 07/66: Add NEWS entry, Dmitry Gutov, 2018/11/05
- [elpa] master 5c2425b 06/66: Work around python-shell-completion-at-point's behavior, Dmitry Gutov, 2018/11/05
- [elpa] master a64d52c 05/66: Deprecate company-nxml too,
Dmitry Gutov <=
- [elpa] master 5698be9 10/66: Simplify company-cmake-prefix-dollar-brace-p, Dmitry Gutov, 2018/11/05
- [elpa] master 5118b59 14/66: company-tng: Supress post-completion (#731), Dmitry Gutov, 2018/11/05
- [elpa] master a78f7d8 15/66: Merge pull request #764 from nikital/tng-supress-post-completion, Dmitry Gutov, 2018/11/05
- [elpa] master 5a856d7 13/66: backend: Remove pre-completion command, Dmitry Gutov, 2018/11/05
- [elpa] master 5b11709 31/66: Emacs 24 doesn't have working elisp capf, so don't test it, Dmitry Gutov, 2018/11/05
- [elpa] master b0940fb 29/66: Close #798: look for :company-match function in the capf's metadata, Dmitry Gutov, 2018/11/05
- [elpa] master f404a12 30/66: Add some tests for the previous commits, Dmitry Gutov, 2018/11/05
- [elpa] master 0325a40 11/66: Remove an unnecessary test, Dmitry Gutov, 2018/11/05
- [elpa] master ed1085f 19/66: Merge pull request #771 from Wilfred/interactive-example, Dmitry Gutov, 2018/11/05
- [elpa] master 7d6ab3c 22/66: company-keywords: Support thrift-mode, Dmitry Gutov, 2018/11/05