Bumped version to 0.5.

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

diff --git a/company-nxml.el b/company-nxml.el
index d9d30574ff29fc9366fe2ff625fe5b5668cc99aa..bacc1dc96483e6f1c1f8ae91d07046e00b02db94 100644 (file)
--- a/company-nxml.el
+++ b/company-nxml.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2009 Nikolaj Schumacher
 ;;
-;; This file is part of company 0.2.1.
+;; This file is part of company 0.5.
 ;;
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -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)
@@ -102,9 +102,12 @@
                           (all-completions arg
                            (rng-match-possible-value-strings))))))))
 
+;;;###autoload
 (defun company-nxml (command &optional arg &rest ignored)
   "A `company-mode' completion back-end for `nxml-mode'."
+  (interactive (list 'interactive))
   (case command
+    ('interactive (company-begin-backend 'company-nxml))
     ('prefix (or (company-nxml-tag 'prefix)
                  (company-nxml-attribute 'prefix)
                  (company-nxml-attribute-value 'prefix)))