branch: master
commit 1b6b9819a790e8a7ebe0e56507b276190e77b277
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Revert last botched commit
---
packages/company/company-nxml.el | 8 ++------
packages/company/company.el | 5 +----
packages/gnome-c-style/gnome-c-tests.el | 2 --
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/packages/company/company-nxml.el b/packages/company/company-nxml.el
index c405d2e..70e1c09 100644
--- 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
-;; Copyright (C) 2009-2011, 2013, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2013 Free Software Foundation, Inc.
;; Author: Nikolaj Schumacher
@@ -123,10 +123,6 @@
(defun company-nxml (command &optional arg &rest ignored)
"`company-mode' completion back-end 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
diff --git a/packages/company/company.el b/packages/company/company.el
index 7f55625..ce0b5a4 100644
--- a/packages/company/company.el
+++ b/packages/company/company.el
@@ -1,6 +1,6 @@
;;; company.el --- Modular text completion framework -*- lexical-binding: t
-*-
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
;; Author: Nikolaj Schumacher
;; Maintainer: Dmitry Gutov <dgu...@yandex.ru>
@@ -318,9 +318,6 @@ This doesn't include the margins and the scroll bar."
(defcustom company-backends `(,@(unless (version< "24.3.50" emacs-version)
(list 'company-elisp))
company-bbdb
- ;; FIXME: We could use a version-test to exclude
- ;; company-nxml, but we don't know yet if that
- ;; version will be called 25.2 or 26.1.
company-nxml company-css
company-eclim company-semantic company-clang
company-xcode company-ropemacs company-cmake
diff --git a/packages/gnome-c-style/gnome-c-tests.el
b/packages/gnome-c-style/gnome-c-tests.el
index 2c1e220..17dbfe1 100644
--- a/packages/gnome-c-style/gnome-c-tests.el
+++ b/packages/gnome-c-style/gnome-c-tests.el
@@ -282,5 +282,3 @@ G_DECLARE_FINAL_TYPE (GGpgEngineInfo, g_gpg_engine_info,
G_GPG, ENGINE_INFO,
(should (equal class '("Gpg" "Engine" "Info")))
(should (equal parent-package nil))
(should (equal parent-class nil)))))
-
-;;; gnome-c-tests.el ends here
