Only use company-ropemacs when ropemacs-mode is on

Step 1 of moving company-ropemacs out, #159.

diff --git a/NEWS.md b/NEWS.md
index a11b4d972bf379cad7a47be05961e2ea18fb3bcc..a31659afa9e6629ab6f052a4ae94c00256e208be 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,7 @@
 
 ## Next
 
+* `company-ropemacs` is only used when `ropemacs-mode` is on.
 * `company-gtags` is enabled in all `prog-mode` derivatives by default.
 * `company-end-of-buffer-workaround` is not used anymore.
 * `company-begin-commands` includes several `cc-mode` commands.

diff --git a/company-ropemacs.el b/company-ropemacs.el
index 677c4536bc59aff209b3d44b7e867fcf521e123b..4fc3813296d5bf00bec2b8f6ca1918fe84721202 100644 (file)
--- a/company-ropemacs.el
+++ b/company-ropemacs.el
@@ -1,6 +1,6 @@
 ;;; company-ropemacs.el --- company-mode completion back-end for ropemacs
 
-;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2013-2014  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -56,15 +56,11 @@
   "`company-mode' completion back-end for ropemacs.
 
 Depends on third-party code: Pymacs (both Python and Emacs packages),
-rope, ropemacs and ropemode."
+rope, ropemacs and ropemode.  Requires `ropemacs-mode' to be on."
   (interactive (list 'interactive))
   (cl-case command
-    (init (when (and (derived-mode-p 'python-mode)
-                     (not (fboundp 'rope-completions)))
-            (require 'pymacs)
-            (pymacs-load "ropemacs" "rope-")))
     (interactive (company-begin-backend 'company-ropemacs))
-    (prefix (and (derived-mode-p 'python-mode)
+    (prefix (and (bound-and-true-p ropemacs-mode)
                  (not (company-in-string-or-comment))
                  (company-ropemacs--grab-symbol)))
     (candidates (mapcar (lambda (element) (concat arg element))