From 9c6348ecbc8f5403aafe2b3dfccd678a60f921c0 Mon Sep 17 00:00:00 2001 From: Nikolaj Schumacher Date: Sat, 18 Jul 2009 10:52:37 +0200 Subject: [PATCH] Enable CSS and nxml back-ends for derived modes. --- company-css.el | 2 +- company-nxml.el | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/company-css.el b/company-css.el index d89fd1a..b2d4c6a 100644 --- 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 3c4292a..4fc615c 100644 --- 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) -- 2.39.2