Merge commit '2ef6263c65a109b4d36503e6484fdbf4cb307d0f' from company

[gnu-emacs-elpa] / packages / company / company-ropemacs.el

diff --git a/packages/company/company-ropemacs.el b/packages/company/company-ropemacs.el
index 677c4536bc59aff209b3d44b7e867fcf521e123b..4fc3813296d5bf00bec2b8f6ca1918fe84721202 100644 (file)
--- a/packages/company/company-ropemacs.el
+++ b/packages/company/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))