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

* packages/company/company-oddmuse.el: Avoid `eval-when'.

diff --git a/company-etags.el b/company-etags.el
index 956e294afd1682323f2350d704553f052ba45982..f93c763b1502ef9b1037ea064e57916e4e912918 100644 (file)
--- a/company-etags.el
+++ b/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/company-oddmuse.el b/company-oddmuse.el
index 2415a7430664f6c8322dac81c94ece2998246dbf..358d5ea9258333584c8b82488904d635ac2d4dc7 100644 (file)
--- a/company-oddmuse.el
+++ b/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
 
@@ -27,8 +27,8 @@
 
 (require 'company)
 (eval-when-compile (require 'cl))
-(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))
 
 (defvar company-oddmuse-link-regexp
   "\\(\\<[A-Z][[:alnum:]]*\\>\\)\\|\\[\\[\\([[:alnum:]]+\\>\\|\\)")