* packages/company/company-etags.el: Require `cl' for `case'.

* packages/company/company-oddmuse.el: Avoid `eval-when' before requiring `cl'.
* packages/company/company-elisp.el (company-elisp): Simplify.

diff --git a/packages/company/company-elisp.el b/packages/company/company-elisp.el
index 5bfc27e043fee12b431a4ec5c16b3846de5f4ce9..846b5d54068b0e8d694f4ba59990fcfba42c5a83 100644 (file)
--- a/packages/company/company-elisp.el
+++ b/packages/company/company-elisp.el
@@ -197,7 +197,7 @@ first in the candidates list."
   (interactive (list 'interactive))
   (case command
     (interactive (company-begin-backend 'company-elisp))
-    (prefix (and (eq (derived-mode-p 'emacs-lisp-mode) 'emacs-lisp-mode)
+    (prefix (and (derived-mode-p 'emacs-lisp-mode)
                  (company-elisp--prefix)))
     (candidates (company-elisp-candidates arg))
     (sorted company-elisp-show-locals-first)

diff --git a/packages/company/company-etags.el b/packages/company/company-etags.el
index 956e294afd1682323f2350d704553f052ba45982..f93c763b1502ef9b1037ea064e57916e4e912918 100644 (file)
--- a/packages/company/company-etags.el
+++ b/packages/company/company-etags.el
@@ -1,6 +1,6 @@
 ;;; company-etags.el --- company-mode completion back-end for etags
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -25,6 +25,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'company)
 (require 'etags)
 

diff --git a/packages/company/company-oddmuse.el b/packages/company/company-oddmuse.el
index b76c87ea46d4e6fd69dacb56f27c50128c00bbd9..3f8d72fc005f3f323653512994b5311ead6548c0 100644 (file)
--- a/packages/company/company-oddmuse.el
+++ b/packages/company/company-oddmuse.el
@@ -1,6 +1,6 @@
 ;;; company-oddmuse.el --- company-mode completion back-end for oddmuse-mode
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -26,8 +26,8 @@
 ;;; Code:
 
 (require 'company)
-(eval-when 'compile (require 'yaooddmuse nil t))
-(eval-when 'compile (require 'oddmuse nil t))
+(eval-when-compile (require 'yaooddmuse nil t))
+(eval-when-compile (require 'oddmuse nil t))
 (eval-when-compile (require 'cl))
 
 (defvar company-oddmuse-link-regexp