------------------------------------------------------------
revno: 374
committer: Dmitry Gutov <dgu...@yandex.ru>
branch nick: elpa
timestamp: Sun 2013-03-24 02:22:44 +0400
message:
company: Release 0.6.2
modified:
packages/company/company-clang.el
packages/company/company-eclim.el
packages/company/company-elisp.el
packages/company/company-pkg.el
packages/company/company.el
=== modified file 'packages/company/company-clang.el'
--- a/packages/company/company-clang.el 2013-03-23 04:19:13 +0000
+++ b/packages/company/company-clang.el 2013-03-23 22:22:44 +0000
@@ -26,6 +26,7 @@
;;; Code:
(require 'company)
+(require 'company-template)
(eval-when-compile (require 'cl))
(defcustom company-clang-executable
=== modified file 'packages/company/company-eclim.el'
--- a/packages/company/company-eclim.el 2013-03-23 04:19:13 +0000
+++ b/packages/company/company-eclim.el 2013-03-23 22:22:44 +0000
@@ -31,6 +31,7 @@
;;; Code:
(require 'company)
+(require 'company-template)
(eval-when-compile (require 'cl))
(defun company-eclim-executable-find ()
@@ -97,10 +98,9 @@
(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)))))))))
=== modified file 'packages/company/company-elisp.el'
--- a/packages/company/company-elisp.el 2013-03-19 03:47:51 +0000
+++ b/packages/company/company-elisp.el 2013-03-23 22:22:44 +0000
@@ -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.
=== modified file 'packages/company/company-pkg.el'
--- a/packages/company/company-pkg.el 2013-03-23 04:19:13 +0000
+++ b/packages/company/company-pkg.el 2013-03-23 22:22:44 +0000
@@ -1,1 +1,1 @@
-(define-package "company" "0.6.1" "Modular in-buffer completion framework")
+(define-package "company" "0.6.2" "Modular in-buffer completion framework")
=== modified file 'packages/company/company.el'
--- a/packages/company/company.el 2013-03-23 04:19:13 +0000
+++ b/packages/company/company.el 2013-03-23 22:22:44 +0000
@@ -4,7 +4,7 @@
;; Author: Nikolaj Schumacher
;; Maintainer: Dmitry Gutov <dgu...@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 @@
(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 @@
(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 @@
(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
