Merge commit '0cda39255827f283e7578cd469ae42daad9556a2' from js2-mode

[gnu-emacs-elpa] / packages / company / company-nxml.el

diff --git a/packages/company/company-nxml.el b/packages/company/company-nxml.el
index c405d2e9cd757a4b2a40bab027e2812f656432d5..9c180e98599ce811e3dba86a4d24fcc33df8188c 100644 (file)
--- a/packages/company/company-nxml.el
+++ b/packages/company/company-nxml.el
@@ -1,6 +1,6 @@
-;;; company-nxml.el --- company-mode completion back-end for nxml-mode
+;;; company-nxml.el --- company-mode completion backend for nxml-mode
 
-;; Copyright (C) 2009-2011, 2013, 2016  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -121,12 +121,8 @@
 
 ;;;###autoload
 (defun company-nxml (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for `nxml-mode'."
+  "`company-mode' completion backend for `nxml-mode'."
   (interactive (list 'interactive))
-  (if (fboundp 'rng-completion-at-point)
-      ;; In recent Emacsen, nXML provides a good CAPF completion, so we can
-      ;; disable our own implementation.
-      nil
   (cl-case command
     (interactive (company-begin-backend 'company-nxml))
     (prefix (or (company-nxml-tag 'prefix)
@@ -140,7 +136,7 @@
                  ((company-nxml-attribute-value 'prefix)
                   (sort (company-nxml-attribute-value 'candidates arg)
                         'string<))))
-    (sorted t))))
+    (sorted t)))
 
 (provide 'company-nxml)
 ;;; company-nxml.el ends here