X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/2d2431cc6b6cce8dcdf4369e8c1efce9d90bb1a5..6517ec8921438deae6547ab5eb38e004935d5618:/packages/company/company-ropemacs.el diff --git a/packages/company/company-ropemacs.el b/packages/company/company-ropemacs.el index 677c4536b..4fc381329 100644 --- 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))