From 3b953efb9a7071f7dfb34906247e2a8e554fbb45 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 18 Mar 2013 09:13:55 +0400 Subject: [PATCH] company-nxml: don't load nxml ourselves --- company-nxml.el | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/company-nxml.el b/company-nxml.el index 0be181975..33d6f7b84 100644 --- a/company-nxml.el +++ b/company-nxml.el @@ -1,6 +1,6 @@ ;;; company-nxml.el --- A company-mode completion back-end for nxml-mode -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011, 2013 Free Software Foundation, Inc. ;; Author: Nikolaj Schumacher @@ -26,10 +26,19 @@ ;;; Code: (require 'company) -(require 'nxml-mode) -(require 'rng-nxml) (eval-when-compile (require 'cl)) +(defvar rng-open-elements) +(defvar rng-validate-mode) +(defvar rng-in-attribute-regex) +(defvar rng-in-attribute-value-regex) +(declare-function rng-set-state-after "rng-nxml") +(declare-function rng-match-possible-start-tag-names "rng-match") +(declare-function rng-adjust-state-for-attribute "rng-nxml") +(declare-function rng-match-possible-attribute-names "rng-match") +(declare-function rng-adjust-state-for-attribute-value "rng-nxml") +(declare-function rng-match-possible-value-strings "rng-match") + (defconst company-nxml-token-regexp "\\(?:[_[:alpha:]][-._[:alnum:]]*\\_>\\)") -- 2.39.2