From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 19 Apr 2014 10:11:04 +0000 (+0400)
Subject: Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/77719a9c033ff72b9d2d6c0d857c77642b26a8b0

Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master

Conflicts:
	packages/company/company-pysmell.el
---

77719a9c033ff72b9d2d6c0d857c77642b26a8b0
diff --cc packages/company/company-elisp-tests.el
index 000000000,9b7cba333..9b7cba333
mode 000000,100644..100644
--- a/packages/company/company-elisp-tests.el
+++ b/packages/company/company-elisp-tests.el
diff --cc packages/company/company-pysmell.el
index 5c44f06aa,d9cf86b0f..2f22bf0f5
--- a/packages/company/company-pysmell.el
+++ b/packages/company/company-pysmell.el
@@@ -1,6 -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  Free Software Foundation, Inc.
++;; Copyright (C) 2009-2011, 2013-2014  Free Software Foundation, Inc.
  
  ;; Author: Nikolaj Schumacher
  
@@@ -27,8 -27,8 +27,8 @@@
  
  ;;; Code:
  
- (eval-when-compile (require 'cl))
 -(require 'pysmell)
 +(if t (require 'pysmell))               ;Don't load during compilation.
+ (require 'cl-lib)
  
  (defvar company-pysmell--available-p 'unknown)
  (make-variable-buffer-local 'company-pysmell--available-p)