Enable CSS and nxml back-ends for derived modes.

[gnu-emacs-elpa] / company-css.el

diff --git a/company-css.el b/company-css.el
index 524c481b6a545cff9234bbd095a9d0ffe1dc9a24..b2d4c6aea3432e73ac6835f8b289e87624bb5278 100644 (file)
--- a/company-css.el
+++ b/company-css.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2009 Nikolaj Schumacher
 ;;
-;; This file is part of company.
+;; This file is part of company 0.4.3.
 ;;
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -263,18 +263,20 @@
   "Return the CSS property before point, if any.
 Returns \"\" if no property found, but feasible at this position."
   (when (company-css-inside-braces-p)
-    (or (company-grab "\\_<[[:alpha:]-]+\\_>\\=")
-        (company-grab "{\\|[[:space:]]" 1))))
+    (company-grab-symbol)))
 
 ;;; values
 (defconst company-css-property-value-regexp
   "\\_<\\([[:alpha:]-]+\\):\\(?:[^};]*[[:space:]]+\\)?\\([^};]*\\_>\\|\\)\\="
   "A regular expression matching CSS tags")
 
+;;;###autoload
 (defun company-css (command &optional arg &rest ignored)
   "A `company-mode' completion back-end for `css-mode'."
+  (interactive (list 'interactive))
   (case command
-    ('prefix (and (eq major-mode 'css-mode)
+    ('interactive (company-begin-backend 'company-css))
+    ('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)