* sed-mode: New package

diff --git a/packages/company/company-nxml.el b/packages/company/company-nxml.el
index 70e1c096bf31b561d403a5ade0d22187c5e10b3f..c405d2e9cd757a4b2a40bab027e2812f656432d5 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
 
-;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2013, 2016  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -123,6 +123,10 @@
 (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)
@@ -136,7 +140,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 ce0b5a46c8103fc5ab412d9b994593a6cb4c5063..7f556257131f13b3884eac5204a8dde334e7cdd5 100644 (file)
--- 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-2015  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2016  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 ;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
@@ -318,6 +318,9 @@ 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 17dbfe1f74894dbd58db6ce1b12947b481e28589..2c1e2208db577379a6db90fa5fdc121f755de3ed 100644 (file)
--- a/packages/gnome-c-style/gnome-c-tests.el
+++ b/packages/gnome-c-style/gnome-c-tests.el
@@ -282,3 +282,5 @@ 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