From c2e59818c0988d3412bcef06da8cab596afd1207 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Tue, 10 Mar 2015 03:35:19 +0200 Subject: [PATCH] Remove company-ropemacs The relevant code was moved to ropemacs proper. --- NEWS.md | 2 ++ company-ropemacs.el | 72 --------------------------------------------- company.el | 3 +- 3 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 company-ropemacs.el diff --git a/NEWS.md b/NEWS.md index c83b34b7c..409dca89f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,8 @@ ## Next +* `company-ropemacs` was removed. `ropemacs` supports completion via + `completion-at-point-functions` starting with version 0.8. * `company-pysmell` was removed. * `company-select-next`, `company-select-previous`, `company-select-next-or-abort`, `company-select-previous-or-abort` and diff --git a/company-ropemacs.el b/company-ropemacs.el deleted file mode 100644 index 4fc381329..000000000 --- a/company-ropemacs.el +++ /dev/null @@ -1,72 +0,0 @@ -;;; company-ropemacs.el --- company-mode completion back-end for ropemacs - -;; Copyright (C) 2009-2011, 2013-2014 Free Software Foundation, Inc. - -;; Author: Nikolaj Schumacher - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see . - - -;;; Commentary: -;; - -;;; Code: - -(require 'cl-lib) - -(defun company-ropemacs--grab-symbol () - (let ((symbol (company-grab-symbol))) - (when symbol - (cons symbol - (save-excursion - (let ((pos (point))) - (goto-char (- (point) (length symbol))) - (while (eq (char-before) ?.) - (goto-char (1- (point))) - (skip-syntax-backward "w_")) - (- pos (point)))))))) - -(defun company-ropemacs-doc-buffer (candidate) - "Return buffer with docstring of CANDIDATE if it is available." - (let ((doc (company-with-candidate-inserted candidate (rope-get-doc)))) - (when doc - (company-doc-buffer doc)))) - -(defun company-ropemacs-location (candidate) - "Return location of CANDIDATE in cons form (FILE . LINE) if it is available." - (let ((location (company-with-candidate-inserted candidate - (rope-definition-location)))) - (when location - (cons (elt location 0) (elt location 1))))) - -(defun company-ropemacs (command &optional arg &rest ignored) - "`company-mode' completion back-end for ropemacs. - -Depends on third-party code: Pymacs (both Python and Emacs packages), -rope, ropemacs and ropemode. Requires `ropemacs-mode' to be on." - (interactive (list 'interactive)) - (cl-case command - (interactive (company-begin-backend 'company-ropemacs)) - (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)) - (rope-completions))) - (doc-buffer (company-ropemacs-doc-buffer arg)) - (location (company-ropemacs-location arg)))) - -(provide 'company-ropemacs) -;;; company-ropemacs.el ends here diff --git a/company.el b/company.el index d0193f42d..8a257c788 100644 --- a/company.el +++ b/company.el @@ -300,7 +300,6 @@ This doesn't include the margins and the scroll bar." (company-keywords . "Programming language keywords") (company-nxml . "nxml") (company-oddmuse . "Oddmuse") - (company-ropemacs . "ropemacs") (company-semantic . "Semantic") (company-tempo . "Tempo templates") (company-xcode . "Xcode"))) @@ -319,7 +318,7 @@ This doesn't include the margins and the scroll bar." company-bbdb company-nxml company-css company-eclim company-semantic company-clang - company-xcode company-ropemacs company-cmake + company-xcode company-cmake company-capf (company-dabbrev-code company-gtags company-etags company-keywords) -- 2.39.2