[elpa] 35/35: Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit 77719a9c033ff72b9d2d6c0d857c77642b26a8b0
Merge: 0c8e3a1 51c140c
Author: Dmitry Gutov <address@hidden>
Date:   Sat Apr 19 14:11:04 2014 +0400

    Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master
    
    Conflicts:
        packages/company/company-pysmell.el

 packages/company/.travis.yml             |   10 +-
 packages/company/Makefile                |    4 +-
 packages/company/NEWS.md                 |   14 +
 packages/company/company-abbrev.el       |    4 +-
 packages/company/company-bbdb.el         |   12 +-
 packages/company/company-capf.el         |   13 +-
 packages/company/company-clang.el        |   75 +++--
 packages/company/company-cmake.el        |    4 +-
 packages/company/company-css.el          |    4 +-
 packages/company/company-dabbrev-code.el |    4 +-
 packages/company/company-dabbrev.el      |   10 +-
 packages/company/company-eclim.el        |   18 +-
 packages/company/company-elisp-tests.el  |  193 ++++++++++++
 packages/company/company-elisp.el        |   14 +-
 packages/company/company-etags.el        |   10 +-
 packages/company/company-files.el        |    8 +-
 packages/company/company-gtags.el        |    6 +-
 packages/company/company-ispell.el       |    4 +-
 packages/company/company-keywords.el     |    4 +-
 packages/company/company-nxml.el         |   10 +-
 packages/company/company-oddmuse.el      |    6 +-
 packages/company/company-pysmell.el      |    8 +-
 packages/company/company-ropemacs.el     |    4 +-
 packages/company/company-semantic.el     |    4 +-
 packages/company/company-template.el     |   16 +-
 packages/company/company-tempo.el        |    4 +-
 packages/company/company-tests.el        |  402 +++++++++++++------------
 packages/company/company-xcode.el        |    4 +-
 packages/company/company-yasnippet.el    |    3 +-
 packages/company/company.el              |  474 ++++++++++++++++++-----------
 30 files changed, 842 insertions(+), 504 deletions(-)

diff --cc packages/company/company-elisp-tests.el
index 0000000,9b7cba3..9b7cba3
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 5c44f06,d9cf86b..2f22bf0
--- 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)