X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/3aaa9f3043c962c5b2a2473e86fec23cf0d01c20..41ef088456675919e4b56a41f964d50a81a781dc:/packages/company/company-pysmell.el diff --git a/packages/company/company-pysmell.el b/packages/company/company-pysmell.el index 5c44f06aa..8a69e7690 100644 --- a/packages/company/company-pysmell.el +++ b/packages/company/company-pysmell.el @@ -1,6 +1,6 @@ ;;; company-pysmell.el --- company-mode completion back-end for pysmell.el -;; Copyright (C) 2009-2011, 2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011, 2013-2014 Free Software Foundation, Inc. ;; Author: Nikolaj Schumacher @@ -27,16 +27,16 @@ ;;; Code: -(eval-when-compile (require 'cl)) (if t (require 'pysmell)) ;Don't load during compilation. +(require 'company) +(require 'cl-lib) -(defvar company-pysmell--available-p 'unknown) -(make-variable-buffer-local 'company-pysmell--available-p) +(defvar-local company-pysmell--available-p 'unknown) (defun company-pysmell--available-p () (if (eq company-pysmell--available-p 'unknown) (setq company-pysmell--available-p - (company-locate-dominating-file buffer-file-name "PYSMELLTAGS")) + (locate-dominating-file buffer-file-name "PYSMELLTAGS")) company-pysmell--available-p)) (defun company-pysmell--grab-symbol () @@ -56,7 +56,7 @@ "`company-mode' completion back-end for pysmell. This requires pysmell.el and pymacs.el." (interactive (list 'interactive)) - (case command + (cl-case command (interactive (company-begin-backend 'company-pysmell)) (prefix (and (derived-mode-p 'python-mode) buffer-file-name