Enable CSS and nxml back-ends for derived modes.

diff --git a/company-css.el b/company-css.el
index d89fd1a4307b6334c273228830cde6fa069e628e..b2d4c6aea3432e73ac6835f8b289e87624bb5278 100644 (file)
--- a/company-css.el
+++ b/company-css.el
@@ -276,7 +276,7 @@ Returns \"\" if no property found, but feasible at this position."
   (interactive (list 'interactive))
   (case command
     ('interactive (company-begin-backend 'company-css))
-    ('prefix (and (eq major-mode 'css-mode)
+    ('prefix (and (derived-mode-p 'css-mode)
                   (or (company-grab company-css-tag-regexp 1)
                       (company-grab company-css-pseudo-regexp 1)
                       (company-grab company-css-property-value-regexp 2)

diff --git a/company-nxml.el b/company-nxml.el
index 3c4292ac7a6fae7ab56d26fb4d8079228670ec8e..4fc615c32b2c2934b7f3fbcc054ec87064b57551 100644 (file)
--- a/company-nxml.el
+++ b/company-nxml.el
@@ -60,7 +60,7 @@
 
 (defun company-nxml-tag (command &optional arg &rest ignored)
   (case command
-    ('prefix (and (eq major-mode 'nxml-mode)
+    ('prefix (and (derived-mode-p 'nxml-mode)
                   rng-validate-mode
                   (company-grab company-nxml-in-tag-name-regexp 1)))
     ('candidates (company-nxml-prepared
@@ -70,7 +70,7 @@
 
 (defun company-nxml-attribute (command &optional arg &rest ignored)
   (case command
-    ('prefix (and (eq major-mode 'nxml-mode)
+    ('prefix (and (derived-mode-p 'nxml-mode)
                   rng-validate-mode
                   (memq (char-after) '(?\  ?\t ?\n)) ;; outside word
                   (company-grab rng-in-attribute-regex 1)))
@@ -83,7 +83,7 @@
 
 (defun company-nxml-attribute-value (command &optional arg &rest ignored)
   (case command
-    ('prefix (and (eq major-mode 'nxml-mode)
+    ('prefix (and (derived-mode-p 'nxml-mode)
                   rng-validate-mode
                   (and (memq (char-after) '(?' ?\" ?\  ?\t ?\n)) ;; outside word
                        (looking-back company-nxml-in-attribute-value-regexp)