company: Release 0.6.2

diff --git a/packages/company/company-clang.el b/packages/company/company-clang.el
index 3d28f0ccdb80145abc587deb086dfe5fb7ee46d0..6844bb0619f3b6f4188430afba0889b637e4401d 100644 (file)
--- a/packages/company/company-clang.el
+++ b/packages/company/company-clang.el
@@ -26,6 +26,7 @@
 ;;; Code:
 
 (require 'company)
+(require 'company-template)
 (eval-when-compile (require 'cl))
 
 (defcustom company-clang-executable

diff --git a/packages/company/company-eclim.el b/packages/company/company-eclim.el
index 599bf6e72e69d5522281792a05a464d1dad504fa..f8a55dc445d88c91e3f2c46b63e60060d8675e50 100644 (file)
--- a/packages/company/company-eclim.el
+++ b/packages/company/company-eclim.el
@@ -31,6 +31,7 @@
 ;;; Code:
 
 (require 'company)
+(require 'company-template)
 (eval-when-compile (require 'cl))
 
 (defun company-eclim-executable-find ()
@@ -97,10 +98,9 @@ eclim can only complete correctly when the buffer has been saved."
       (let ((dir (company-eclim--project-dir)))
         (when dir
           (setq company-eclim--project-name
-                (let ((project (find-if (lambda (project)
-                                          (equal (cdr (assoc 'path project))
-                                                 dir))
-                                        (company-eclim--project-list))))
+                (let ((project (loop for project in (company-eclim--project-list)
+                                     when (equal (cdr (assoc 'path project)) dir)
+                                     return project)))
                   (when project
                     (cdr (assoc 'name project)))))))))
 

diff --git a/packages/company/company-elisp.el b/packages/company/company-elisp.el
index ec3161d553220a87954018d13144a0957a547065..986cd3d4b73b254f62c2f309096022ac2e0b4220 100644 (file)
--- a/packages/company/company-elisp.el
+++ b/packages/company/company-elisp.el
@@ -28,6 +28,7 @@
 (require 'company)
 (eval-when-compile (require 'cl))
 (require 'help-mode)
+(require 'find-func)
 
 (defcustom company-elisp-detect-function-context t
   "If enabled, offer Lisp functions only in appropriate contexts.

diff --git a/packages/company/company-pkg.el b/packages/company/company-pkg.el
index b2dd18d9bd954f3abd8819b1cb5463a4e1988f3b..69b3d128eed354f5d275d9dd057743ba924f171b 100644 (file)
--- a/packages/company/company-pkg.el
+++ b/packages/company/company-pkg.el
@@ -1 +1 @@
-(define-package "company" "0.6.1" "Modular in-buffer completion framework")\r
+(define-package "company" "0.6.2" "Modular in-buffer completion framework")\r

diff --git a/packages/company/company.el b/packages/company/company.el
index facf48b1f3d681f1d3c871a8f65e10fd2423cdda..e7e054032a3feb81ff177eb4de8820f7c5fddde0 100644 (file)
--- a/packages/company/company.el
+++ b/packages/company/company.el
@@ -4,7 +4,7 @@
 
 ;; Author: Nikolaj Schumacher
 ;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Keywords: abbrev, convenience, matching
 ;; URL: http://company-mode.github.com/
 ;; Compatibility: GNU Emacs 22.x, GNU Emacs 23.x, GNU Emacs 24.x
@@ -550,9 +550,12 @@ keymap during active completions (`company-active-map'):
     (company-cancel)
     (kill-local-variable 'company-point)))
 
-(define-globalized-minor-mode global-company-mode company-mode
-  (lambda () (unless (or noninteractive (eq (aref (buffer-name) 0) ?\s))
-          (company-mode 1))))
+;;;###autoload
+(define-globalized-minor-mode global-company-mode company-mode company-mode-on)
+
+(defun company-mode-on ()
+  (unless (or noninteractive (eq (aref (buffer-name) 0) ?\s))
+    (company-mode 1)))
 
 (defsubst company-assert-enabled ()
   (unless company-mode
@@ -655,10 +658,10 @@ keymap during active completions (`company-active-map'):
     (apply 'company--multi-backend-adapter company-backend args)))
 
 (defun company--multi-backend-adapter (backends command &rest args)
-  (let ((backends (remove-if (lambda (b)
-                               (and (symbolp b)
-                                    (eq 'failed (get b 'company-init))))
-                             backends)))
+  (let ((backends (loop for b in backends
+                        when (not (and (symbolp b)
+                                       (eq 'failed (get b 'company-init))))
+                        collect b)))
     (case command
       (candidates
        (loop for backend in backends
@@ -1999,9 +2002,5 @@ Returns a negative number if the tooltip should be displayed above point."
     (post-command (company-echo-show-when-idle 'company-fetch-metadata))
     (hide (company-echo-hide))))
 
-;; templates ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(autoload 'company-template-declare-template "company-template")
-
 (provide 'company)
 ;;; company.el ends here