[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 11/14: Only use company-ropemacs when ropemacs-mode is on
From: |
Dmitry Gutov |
Subject: |
[elpa] 11/14: Only use company-ropemacs when ropemacs-mode is on |
Date: |
Sat, 13 Sep 2014 12:19:03 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit 6a4722971156955b80acb613cdba20caac28ced1
Author: Dmitry Gutov <address@hidden>
Date: Sat Sep 13 16:13:06 2014 +0400
Only use company-ropemacs when ropemacs-mode is on
Step 1 of moving company-ropemacs out, #159.
---
NEWS.md | 1 +
company-ropemacs.el | 10 +++-------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index a11b4d9..a31659a 100644
--- 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 677c453..4fc3813 100644
--- 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))
- [elpa] 04/14: Add test for the previous commit, (continued)
- [elpa] 04/14: Add test for the previous commit, Dmitry Gutov, 2014/09/13
- [elpa] 07/14: Use posn-actual-col-row to calculate the row, Dmitry Gutov, 2014/09/13
- [elpa] 08/14: company-complete-number: Make interactive, read the pressed digit, Dmitry Gutov, 2014/09/13
- [elpa] 09/14: company-gtags-modes: Turn into defcustom, Dmitry Gutov, 2014/09/13
- [elpa] 10/14: company-with-candidate-inserted: restore buffer modification status, Dmitry Gutov, 2014/09/13
- [elpa] 06/14: Don't use end-of-buffer-workaround, Dmitry Gutov, 2014/09/13
- [elpa] 13/14: Release 0.8.4, Dmitry Gutov, 2014/09/13
- [elpa] 01/14: company-begin-commands: include some cc-mode commands, Dmitry Gutov, 2014/09/13
- [elpa] 12/14: company--posn-col-row: add comment, Dmitry Gutov, 2014/09/13
- [elpa] 05/14: Adjust for debbugs:18384 being fixed now, Dmitry Gutov, 2014/09/13
- [elpa] 11/14: Only use company-ropemacs when ropemacs-mode is on,
Dmitry Gutov <=
- [elpa] 14/14: Merge commit '2ef6263c65a109b4d36503e6484fdbf4cb307d0f' from company, Dmitry Gutov, 2014/09/13
- [elpa] 03/14: company--posn-col-row: incf instead of decf for non-nil h-l-f, Dmitry Gutov, 2014/09/13
- [elpa] 02/14: company--posn-col-row: use `posn-col-row', Dmitry Gutov, 2014/09/13