company: Release 0.6.10

[gnu-emacs-elpa] / packages / company / company.el

diff --git a/packages/company/company.el b/packages/company/company.el
index 5314ef601ec9ba67ef40ea1dfd2f85d0687f9f7e..39a3a17c268e7d2bccffddbb1d767dfdb4d23a57 100644 (file)
--- a/packages/company/company.el
+++ b/packages/company/company.el
@@ -1,12 +1,13 @@
-;;; company.el --- Extensible inline text completion mechanism
+;;; company.el --- Modular in-buffer completion framework  -*- lexical-binding: t -*-

 
 

-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2013  Free Software Foundation, Inc.

 
 ;; Author: Nikolaj Schumacher
 
 ;; Author: Nikolaj Schumacher

-;; Version: 0.5
+;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
+;; Version: 0.6.10

 ;; Keywords: abbrev, convenience, matching
 ;; Keywords: abbrev, convenience, matching

-;; URL: http://nschum.de/src/emacs/company-mode/
-;; Compatibility: GNU Emacs 22.x, GNU Emacs 23.x
+;; URL: http://company-mode.github.io/
+;; Compatibility: GNU Emacs 22.x, GNU Emacs 23.x, GNU Emacs 24.x

 
 ;; This file is part of GNU Emacs.
 
 
 ;; This file is part of GNU Emacs.
 


@@ -29,7 +30,7 @@
 ;; candidates are called back-ends, modules for displaying them are front-ends.
 ;;
 ;; Company comes with many back-ends, e.g. `company-elisp'.  These are
 ;; candidates are called back-ends, modules for displaying them are front-ends.
 ;;
 ;; Company comes with many back-ends, e.g. `company-elisp'.  These are

-;; distributed in individual files and can be used individually.
+;; distributed in separate files and can be used individually.

 ;;
 ;; Place company.el and the back-ends you want to use in a directory and add the
 ;; following to your .emacs:
 ;;
 ;; Place company.el and the back-ends you want to use in a directory and add the
 ;; following to your .emacs:


@@ -49,14 +50,13 @@
 ;; (defun company-my-backend (command &optional arg &rest ignored)
 ;;   (case command
 ;;     (prefix (when (looking-back "foo\\>")
 ;; (defun company-my-backend (command &optional arg &rest ignored)
 ;;   (case command
 ;;     (prefix (when (looking-back "foo\\>")

-;;                (match-string 0)))
+;;               (match-string 0)))

 ;;     (candidates (list "foobar" "foobaz" "foobarbaz"))
 ;;     (meta (format "This value is named %s" arg))))
 ;;
 ;;     (candidates (list "foobar" "foobaz" "foobarbaz"))
 ;;     (meta (format "This value is named %s" arg))))
 ;;

-;; Sometimes it is a good idea to mix two back-ends together, for example to
-;; enrich gtags with dabbrev-code results (to emulate local variables):
-;; To do this, add a list with the merged back-ends as an element in
-;; company-backends.
+;; Sometimes it is a good idea to mix several back-ends together, for example to
+;; enrich gtags with dabbrev-code results (to emulate local variables).
+;; To do this, add a list with both back-ends as an element in company-backends.

 ;;
 ;; Known Issues:
 ;; When point is at the very end of the buffer, the pseudo-tooltip appears very
 ;;
 ;; Known Issues:
 ;; When point is at the very end of the buffer, the pseudo-tooltip appears very


@@ -65,78 +65,13 @@
 ;;
 ;;; Change Log:
 ;;
 ;;
 ;;; Change Log:
 ;;

-;; 2010-02-24 (0.5)
-;;    `company-ropemacs' now provides location and docs.  (Fernando H. Silva)
-;;    Added `company-with-candidate-inserted' macro.
-;;    Added `company-clang' back-end.
-;;    Added new mechanism for non-consecutive insertion.
-;;      (So far only used by clang for ObjC.)
-;;    The semantic back-end now shows meta information for local symbols.
-;;    Added compatibility for CEDET in Emacs 23.2 and from CVS.  (Oleg Andreev)
-;;
-;; 2009-05-07 (0.4.3)
-;;    Added `company-other-backend'.
-;;    Idle completion no longer interrupts multi-key command input.
-;;    Added `company-ropemacs' and `company-pysmell' back-ends.
-;;
-;; 2009-04-25 (0.4.2)
-;;    In C modes . and -> now count towards `company-minimum-prefix-length'.
-;;    Reverted default front-end back to `company-preview-if-just-one-frontend'.
-;;    The pseudo tooltip will no longer be clipped at the right window edge.
-;;    Added `company-tooltip-minimum'.
-;;    Windows compatibility fixes.
-;;
-;; 2009-04-19 (0.4.1)
-;;    Added `global-company-mode'.
-;;    Performance enhancements.
-;;    Added `company-eclim' back-end.
-;;    Added safer workaround for Emacs `posn-col-row' bug.
-;;
-;; 2009-04-18 (0.4)
-;;    Automatic completion is now aborted if the prefix gets too short.
-;;    Added option `company-dabbrev-time-limit'.
-;;    `company-backends' now supports merging back-ends.
-;;    Added back-end `company-dabbrev-code' for generic code.
-;;    Fixed `company-begin-with'.
-;;
-;; 2009-04-15 (0.3.1)
-;;    Added 'stop prefix to prevent dabbrev from completing inside of symbols.
-;;    Fixed issues with tabbar-mode and line-spacing.
-;;    Performance enhancements.
-;;
-;; 2009-04-12 (0.3)
-;;    Added `company-begin-commands' option.
-;;    Added abbrev, tempo and Xcode back-ends.
-;;    Back-ends are now interactive.  You can start them with M-x backend-name.
-;;    Added `company-begin-with' for starting company from elisp-code.
-;;    Added hooks.
-;;    Added `company-require-match' and `company-auto-complete' options.
-;;
-;; 2009-04-05 (0.2.1)
-;;    Improved Emacs Lisp back-end behavior for local variables.
-;;    Added `company-elisp-detect-function-context' option.
-;;    The mouse can now be used for selection.
-;;
-;; 2009-03-22 (0.2)
-;;    Added `company-show-location'.
-;;    Added etags back-end.
-;;    Added work-around for end-of-buffer bug.
-;;    Added `company-filter-candidates'.
-;;    More local Lisp variables are now included in the candidates.
-;;
-;; 2009-03-21 (0.1.5)
-;;    Fixed elisp documentation buffer always showing the same doc.
-;;    Added `company-echo-strip-common-frontend'.
-;;    Added `company-show-numbers' option and M-0 ... M-9 default bindings.
-;;    Don't hide the echo message if it isn't shown.
-;;
-;; 2009-03-20 (0.1)
-;;    Initial release.
+;; See NEWS.md in the repository.

 
 ;;; Code:
 
 (eval-when-compile (require 'cl))
 
 
 ;;; Code:
 
 (eval-when-compile (require 'cl))
 

+;; FIXME: Use `user-error'.

 (add-to-list 'debug-ignored-errors "^.* frontend cannot be used twice$")
 (add-to-list 'debug-ignored-errors "^Echo area cannot be used twice$")
 (add-to-list 'debug-ignored-errors "^No \\(document\\|loc\\)ation available$")
 (add-to-list 'debug-ignored-errors "^.* frontend cannot be used twice$")
 (add-to-list 'debug-ignored-errors "^Echo area cannot be used twice$")
 (add-to-list 'debug-ignored-errors "^No \\(document\\|loc\\)ation available$")


@@ -152,62 +87,64 @@
   :group 'matching)
 
 (defface company-tooltip
   :group 'matching)
 
 (defface company-tooltip

-  '((t :background "yellow"
-       :foreground "black"))
-  "*Face used for the tool tip."
-  :group 'company)
+  '((default :foreground "black")
+    (((class color) (min-colors 88) (background light))
+     (:background "cornsilk"))
+    (((class color) (min-colors 88) (background dark))
+     (:background "yellow")))
+  "Face used for the tooltip.")

 
 (defface company-tooltip-selection
   '((default :inherit company-tooltip)
 
 (defface company-tooltip-selection
   '((default :inherit company-tooltip)

-    (((class color) (min-colors 88)) (:background "orange1"))
+    (((class color) (min-colors 88) (background light))
+     (:background "light blue"))
+    (((class color) (min-colors 88) (background dark))
+     (:background "orange1"))

     (t (:background "green")))
     (t (:background "green")))

-  "*Face used for the selection in the tool tip."
-  :group 'company)
+  "Face used for the selection in the tooltip.")

 
 (defface company-tooltip-mouse
   '((default :inherit highlight))
 
 (defface company-tooltip-mouse
   '((default :inherit highlight))

-  "*Face used for the tool tip item under the mouse."
-  :group 'company)
+  "Face used for the tooltip item under the mouse.")

 
 (defface company-tooltip-common
 
 (defface company-tooltip-common

-  '((t :inherit company-tooltip
-       :foreground "red"))
-  "*Face used for the common completion in the tool tip."
-  :group 'company)
+  '((default :inherit company-tooltip)
+    (((background light))
+     :foreground "darkred")
+    (((background dark))
+     :foreground "red"))
+  "Face used for the common completion in the tooltip.")

 
 (defface company-tooltip-common-selection
 
 (defface company-tooltip-common-selection

-  '((t :inherit company-tooltip-selection
-       :foreground "red"))
-  "*Face used for the selected common completion in the tool tip."
-  :group 'company)
+  '((default :inherit company-tooltip-selection)
+    (((background light))
+     :foreground "darkred")
+    (((background dark))
+     :foreground "red"))
+  "Face used for the selected common completion in the tooltip.")

 
 (defface company-preview
   '((t :background "blue4"
        :foreground "wheat"))
 
 (defface company-preview
   '((t :background "blue4"
        :foreground "wheat"))

-  "*Face used for the completion preview."
-  :group 'company)
+  "Face used for the completion preview.")

 
 (defface company-preview-common
   '((t :inherit company-preview
        :foreground "red"))
 
 (defface company-preview-common
   '((t :inherit company-preview
        :foreground "red"))

-  "*Face used for the common part of the completion preview."
-  :group 'company)
+  "Face used for the common part of the completion preview.")

 
 (defface company-preview-search
   '((t :inherit company-preview
        :background "blue1"))
 
 (defface company-preview-search
   '((t :inherit company-preview
        :background "blue1"))

-  "*Face used for the search string in the completion preview."
-  :group 'company)
+  "Face used for the search string in the completion preview.")

 
 (defface company-echo nil
 
 (defface company-echo nil

-  "*Face used for completions in the echo area."
-  :group 'company)
+  "Face used for completions in the echo area.")

 
 (defface company-echo-common
   '((((background dark)) (:foreground "firebrick1"))
     (((background light)) (:background "firebrick4")))
 
 (defface company-echo-common
   '((((background dark)) (:foreground "firebrick1"))
     (((background light)) (:background "firebrick4")))

-  "*Face used for the common part of completions in the echo area."
-  :group 'company)
+  "Face used for the common part of completions in the echo area.")

 
 (defun company-frontends-set (variable value)
   ;; uniquify
 
 (defun company-frontends-set (variable value)
   ;; uniquify


@@ -231,27 +168,26 @@
 (defcustom company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
                                company-preview-if-just-one-frontend
                                company-echo-metadata-frontend)
 (defcustom company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
                                company-preview-if-just-one-frontend
                                company-echo-metadata-frontend)

-  "*The list of active front-ends (visualizations).
+  "The list of active front-ends (visualizations).

 Each front-end is a function that takes one argument.  It is called with
 one of the following arguments:
 
 Each front-end is a function that takes one argument.  It is called with
 one of the following arguments:
 

-'show: When the visualization should start.
+`show': When the visualization should start.

 
 

-'hide: When the visualization should end.
+`hide': When the visualization should end.

 
 

-'update: When the data has been updated.
+`update': When the data has been updated.

 
 

-'pre-command: Before every command that is executed while the
+`pre-command': Before every command that is executed while the

 visualization is active.
 
 visualization is active.
 

-'post-command: After every command that is executed while the
+`post-command': After every command that is executed while the

 visualization is active.
 
 The visualized data is stored in `company-prefix', `company-candidates',
 `company-common', `company-selection', `company-point' and
 `company-search-string'."
   :set 'company-frontends-set
 visualization is active.
 
 The visualized data is stored in `company-prefix', `company-candidates',
 `company-common', `company-selection', `company-point' and
 `company-search-string'."
   :set 'company-frontends-set

-  :group 'company

   :type '(repeat (choice (const :tag "echo" company-echo-frontend)
                          (const :tag "echo, strip common"
                                 company-echo-strip-common-frontend)
   :type '(repeat (choice (const :tag "echo" company-echo-frontend)
                          (const :tag "echo, strip common"
                                 company-echo-strip-common-frontend)


@@ -267,34 +203,33 @@ The visualized data is stored in `company-prefix', `company-candidates',
                          (function :tag "custom function" nil))))
 
 (defcustom company-tooltip-limit 10
                          (function :tag "custom function" nil))))
 
 (defcustom company-tooltip-limit 10

-  "*The maximum number of candidates in the tool tip"
-  :group 'company
+  "The maximum number of candidates in the tooltip"

   :type 'integer)
 
 (defcustom company-tooltip-minimum 6
   :type 'integer)
 
 (defcustom company-tooltip-minimum 6

-  "*The minimum height of the tool tip.
+  "The minimum height of the tooltip.

 If this many lines are not available, prefer to display the tooltip above."
 If this many lines are not available, prefer to display the tooltip above."

-  :group 'company

   :type 'integer)
 
 (defvar company-safe-backends
   '((company-abbrev . "Abbrev")
   :type 'integer)
 
 (defvar company-safe-backends
   '((company-abbrev . "Abbrev")

-    (company-clang . "clang")
+    (company-capf . "completion-at-point-functions")
+    (company-clang . "Clang")

     (company-css . "CSS")
     (company-dabbrev . "dabbrev for plain text")
     (company-dabbrev-code . "dabbrev for code")
     (company-css . "CSS")
     (company-dabbrev . "dabbrev for plain text")
     (company-dabbrev-code . "dabbrev for code")

-    (company-eclim . "eclim (an Eclipse interace)")
+    (company-eclim . "Eclim (an Eclipse interface)")

     (company-elisp . "Emacs Lisp")
     (company-etags . "etags")
     (company-files . "Files")
     (company-gtags . "GNU Global")
     (company-elisp . "Emacs Lisp")
     (company-etags . "etags")
     (company-files . "Files")
     (company-gtags . "GNU Global")

-    (company-ispell . "ispell")
+    (company-ispell . "Ispell")

     (company-keywords . "Programming language keywords")
     (company-nxml . "nxml")
     (company-oddmuse . "Oddmuse")
     (company-pysmell . "PySmell")
     (company-ropemacs . "ropemacs")
     (company-keywords . "Programming language keywords")
     (company-nxml . "nxml")
     (company-oddmuse . "Oddmuse")
     (company-pysmell . "PySmell")
     (company-ropemacs . "ropemacs")

-    (company-semantic . "CEDET Semantic")
+    (company-semantic . "Semantic")

     (company-tempo . "Tempo templates")
     (company-xcode . "Xcode")))
 (put 'company-safe-backends 'risky-local-variable t)
     (company-tempo . "Tempo templates")
     (company-xcode . "Xcode")))
 (put 'company-safe-backends 'risky-local-variable t)


@@ -307,35 +242,13 @@ If this many lines are not available, prefer to display the tooltip above."
                         (assq backend company-safe-backends))
                 (return t))))))
 
                         (assq backend company-safe-backends))
                 (return t))))))
 

-(defun company-capf (command &optional arg &rest args)
-  "Adapter for Company completion to use `completion-at-point-functions'."
-  (interactive (list 'interactive))
-  (case command
-    (interactive (company-begin-backend 'company-capf))
-    (prefix
-     (let ((res (run-hook-wrapped 'completion-at-point-functions
-                                  ;; Ignore misbehaving functions.
-                                  #'completion--capf-wrapper 'optimist)))
-       (when (consp res)
-         (if (> (nth 1 res) (point))
-             'stop
-           (buffer-substring-no-properties (nth 0 res) (point))))))
-    (candidates
-     (let ((res (run-hook-wrapped 'completion-at-point-functions
-                                  ;; Ignore misbehaving functions.
-                                  #'completion--capf-wrapper 'optimist)))
-       (when (consp res)
-         (all-completions arg (nth 2 res)
-                          (plist-get (nthcdr 3 res) :predicate)))))))
-
-(defcustom company-backends '(;; company-capf ;FIXME: Untested!
-                              company-elisp company-nxml company-css
-                              company-eclim company-semantic company-clang
+(defcustom company-backends '(company-elisp company-nxml company-css
+                              company-semantic company-clang company-eclim

                               company-xcode company-ropemacs
                               (company-gtags company-etags company-dabbrev-code
                               company-xcode company-ropemacs
                               (company-gtags company-etags company-dabbrev-code

-                               company-pysmell company-keywords)
+                               company-keywords)

                               company-oddmuse company-files company-dabbrev)
                               company-oddmuse company-files company-dabbrev)

-  "*The list of active back-ends (completion engines).
+  "The list of active back-ends (completion engines).

 Each list elements can itself be a list of back-ends.  In that case their
 completions are merged.  Otherwise only the first matching back-end returns
 results.
 Each list elements can itself be a list of back-ends.  In that case their
 completions are merged.  Otherwise only the first matching back-end returns
 results.


@@ -348,20 +261,20 @@ The first argument is the command requested from the back-end.  It is one
 of the following:
 
 `prefix': The back-end should return the text to be completed.  It must be
 of the following:
 
 `prefix': The back-end should return the text to be completed.  It must be

-text immediately before `point'.  Returning nil passes control to the next
-back-end.  The function should return 'stop if it should complete but cannot
-\(e.g. if it is in the middle of a string\).  If the returned value is only
-part of the prefix (e.g. the part after \"->\" in C), the back-end may return a
-cons of prefix and prefix length, which is then used in the
-`company-minimum-prefix-length' test.
+text immediately before point.  Returning nil passes control to the next
+back-end.  The function should return `stop' if it should complete but
+cannot \(e.g. if it is in the middle of a string\).  Instead of a string,
+the back-end may return a cons where car is the prefix and cdr is used in
+`company-minimum-prefix-length' test. It's either number or t, in which
+case the test automatically succeeds.

 
 `candidates': The second argument is the prefix to be completed.  The
 return value should be a list of candidates that start with the prefix.
 
 Optional commands:
 
 
 `candidates': The second argument is the prefix to be completed.  The
 return value should be a list of candidates that start with the prefix.
 
 Optional commands:
 

-`sorted': The back-end may return t here to indicate that the candidates
-are sorted and will not need to be sorted again.
+`sorted': Return t here to indicate that the candidates are sorted and will
+not need to be sorted again.

 
 `duplicates': If non-nil, company will take care of removing duplicates
 from the list.
 
 `duplicates': If non-nil, company will take care of removing duplicates
 from the list.


@@ -370,26 +283,33 @@ from the list.
 progresses, unless the back-end returns t for this command.  The second
 argument is the latest prefix.
 
 progresses, unless the back-end returns t for this command.  The second
 argument is the latest prefix.
 

-`meta': The second argument is a completion candidate.  The back-end should
-return a (short) documentation string for it.
+`meta': The second argument is a completion candidate.  Return a (short)
+documentation string for it.
+
+`doc-buffer': The second argument is a completion candidate.  Return a
+buffer with documentation for it.  Preferably use `company-doc-buffer',
+
+`location': The second argument is a completion candidate.  Return the cons
+of buffer and buffer location, or of file and line number where the
+completion candidate was defined.

 
 

-`doc-buffer': The second argument is a completion candidate.
-The back-end should create a buffer (preferably with `company-doc-buffer'),
-fill it with documentation and return it.
+`require-match': If this returns t, the user is not allowed to enter
+anything not offered as a candidate.  Use with care!  The default value nil
+gives the user that choice with `company-require-match'.  Return value
+`never' overrides that option the other way around.

 
 

-`location': The second argument is a completion candidate.  The back-end can
-return the cons of buffer and buffer location, or of file and line
-number where the completion candidate was defined.
+`init': Called once for each buffer. The back-end can check for external
+programs and files and load any required libraries.  Raising an error here
+will show up in message log once, and the back-end will not be used for
+completion.

 
 

-`require-match': If this value is t, the user is not allowed to enter anything
-not offering as a candidate.  Use with care!  The default value nil gives the
-user that choice with `company-require-match'.  Return value 'never overrides
-that option the other way around.
+`post-completion': Called after a completion candidate has been inserted
+into the buffer.  The second argument is the candidate.  Can be used to
+modify it, e.g. to expand a snippet.

 
 The back-end should return nil for all commands it does not support or
 does not know about.  It should also be callable interactively and use
 `company-begin-backend' to start itself in that case."
 
 The back-end should return nil for all commands it does not support or
 does not know about.  It should also be callable interactively and use
 `company-begin-backend' to start itself in that case."

-  :group 'company

   :type `(repeat
           (choice
            :tag "Back-end"
   :type `(repeat
           (choice
            :tag "Back-end"


@@ -406,65 +326,61 @@ does not know about.  It should also be callable interactively and use
 (put 'company-backends 'safe-local-variable 'company-safe-backends-p)
 
 (defcustom company-completion-started-hook nil
 (put 'company-backends 'safe-local-variable 'company-safe-backends-p)
 
 (defcustom company-completion-started-hook nil

-  "*Hook run when company starts completing.
+  "Hook run when company starts completing.

 The hook is called with one argument that is non-nil if the completion was
 started manually."
 The hook is called with one argument that is non-nil if the completion was
 started manually."

-  :group 'company

   :type 'hook)
 
 (defcustom company-completion-cancelled-hook nil
   :type 'hook)
 
 (defcustom company-completion-cancelled-hook nil

-  "*Hook run when company cancels completing.
+  "Hook run when company cancels completing.

 The hook is called with one argument that is non-nil if the completion was
 aborted manually."
 The hook is called with one argument that is non-nil if the completion was
 aborted manually."

-  :group 'company

   :type 'hook)
 
 (defcustom company-completion-finished-hook nil
   :type 'hook)
 
 (defcustom company-completion-finished-hook nil

-  "*Hook run when company successfully completes.
-The hook is called with the selected candidate as an argument."
-  :group 'company
+  "Hook run when company successfully completes.
+The hook is called with the selected candidate as an argument.
+
+If you indend to use it to post-process candidates from a specific
+back-end, consider using the `post-completion' command instead."

   :type 'hook)
 
 (defcustom company-minimum-prefix-length 3
   :type 'hook)
 
 (defcustom company-minimum-prefix-length 3

-  "*The minimum prefix length for automatic completion."
-  :group 'company
+  "The minimum prefix length for automatic completion."

   :type '(integer :tag "prefix length"))
 
 (defcustom company-require-match 'company-explicit-action-p
   :type '(integer :tag "prefix length"))
 
 (defcustom company-require-match 'company-explicit-action-p

-  "*If enabled, disallow non-matching input.
+  "If enabled, disallow non-matching input.

 This can be a function do determine if a match is required.
 
 This can be a function do determine if a match is required.
 

-This can be overridden by the back-end, if it returns t or 'never to
-'require-match.  `company-auto-complete' also takes precedence over this."
-  :group 'company
+This can be overridden by the back-end, if it returns t or `never' to
+`require-match'.  `company-auto-complete' also takes precedence over this."

   :type '(choice (const :tag "Off" nil)
                  (function :tag "Predicate function")
                  (const :tag "On, if user interaction took place"
                         'company-explicit-action-p)
                  (const :tag "On" t)))
 
   :type '(choice (const :tag "Off" nil)
                  (function :tag "Predicate function")
                  (const :tag "On, if user interaction took place"
                         'company-explicit-action-p)
                  (const :tag "On" t)))
 

-(defcustom company-auto-complete 'company-explicit-action-p
+(defcustom company-auto-complete nil

   "Determines when to auto-complete.
   "Determines when to auto-complete.

-If this is enabled, all characters from `company-auto-complete-chars' complete
-the selected completion.  This can also be a function."
-  :group 'company
+If this is enabled, all characters from `company-auto-complete-chars'
+complete the selected completion.  This can also be a function."

   :type '(choice (const :tag "Off" nil)
                  (function :tag "Predicate function")
                  (const :tag "On, if user interaction took place"
                         'company-explicit-action-p)
                  (const :tag "On" t)))
 
   :type '(choice (const :tag "Off" nil)
                  (function :tag "Predicate function")
                  (const :tag "On, if user interaction took place"
                         'company-explicit-action-p)
                  (const :tag "On" t)))
 

-(defcustom company-auto-complete-chars '(?\  ?\( ?\) ?. ?\" ?$ ?\' ?< ?| ?!)
+(defcustom company-auto-complete-chars '(?\  ?\) ?.)

   "Determines which characters trigger an automatic completion.
   "Determines which characters trigger an automatic completion.

-See `company-auto-complete'.  If this is a string, each string character causes
-completion.  If it is a list of syntax description characters (see
+See `company-auto-complete'.  If this is a string, each string character
+causes completion.  If it is a list of syntax description characters (see

 `modify-syntax-entry'), all characters with that syntax auto-complete.
 
 This can also be a function, which is called with the new input and should
 return non-nil if company should auto-complete.
 
 `modify-syntax-entry'), all characters with that syntax auto-complete.
 
 This can also be a function, which is called with the new input and should
 return non-nil if company should auto-complete.
 

-A character that is part of a valid candidate never starts auto-completion."
-  :group 'company
+A character that is part of a valid candidate never triggers auto-completion."

   :type '(choice (string :tag "Characters")
                  (set :tag "Syntax"
                       (const :tag "Whitespace" ?\ )
   :type '(choice (string :tag "Characters")
                  (set :tag "Syntax"
                       (const :tag "Whitespace" ?\ )


@@ -484,33 +400,30 @@ A character that is part of a valid candidate never starts auto-completion."
                  (function :tag "Predicate function")))
 
 (defcustom company-idle-delay .7
                  (function :tag "Predicate function")))
 
 (defcustom company-idle-delay .7

-  "*The idle delay in seconds until automatic completions starts.
+  "The idle delay in seconds until automatic completions starts.

 A value of nil means never complete automatically, t means complete
 immediately when a prefix of `company-minimum-prefix-length' is reached."
 A value of nil means never complete automatically, t means complete
 immediately when a prefix of `company-minimum-prefix-length' is reached."

-  :group 'company

   :type '(choice (const :tag "never (nil)" nil)
                  (const :tag "immediate (t)" t)
                  (number :tag "seconds")))
 
 (defcustom company-begin-commands t
   :type '(choice (const :tag "never (nil)" nil)
                  (const :tag "immediate (t)" t)
                  (number :tag "seconds")))
 
 (defcustom company-begin-commands t

-  "*A list of commands following which company will start completing.
+  "A list of commands following which company will start completing.

 If this is t, it will complete after any command.  See `company-idle-delay'.
 
 If this is t, it will complete after any command.  See `company-idle-delay'.
 

-Alternatively any command with a non-nil 'company-begin property is treated as
-if it was on this list."
-  :group 'company
+Alternatively any command with a non-nil `company-begin' property is treated
+as if it was on this list."

   :type '(choice (const :tag "Any command" t)
                  (const :tag "Self insert command" '(self-insert-command))
                  (repeat :tag "Commands" function)))
 
 (defcustom company-show-numbers nil
   :type '(choice (const :tag "Any command" t)
                  (const :tag "Self insert command" '(self-insert-command))
                  (repeat :tag "Commands" function)))
 
 (defcustom company-show-numbers nil

-  "*If enabled, show quick-access numbers for the first ten candidates."
-  :group 'company
+  "If enabled, show quick-access numbers for the first ten candidates."

   :type '(choice (const :tag "off" nil)
                  (const :tag "on" t)))
 
 (defvar company-end-of-buffer-workaround t
   :type '(choice (const :tag "off" nil)
                  (const :tag "on" t)))
 
 (defvar company-end-of-buffer-workaround t

-  "*Work around a visualization bug when completing at the end of the buffer.
+  "Work around a visualization bug when completing at the end of the buffer.

 The work-around consists of adding a newline.")
 
 ;;; mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 The work-around consists of adding a newline.")
 
 ;;; mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


@@ -524,16 +437,18 @@ The work-around consists of adding a newline.")
     (define-key keymap "\C-g" 'company-abort)
     (define-key keymap (kbd "M-n") 'company-select-next)
     (define-key keymap (kbd "M-p") 'company-select-previous)
     (define-key keymap "\C-g" 'company-abort)
     (define-key keymap (kbd "M-n") 'company-select-next)
     (define-key keymap (kbd "M-p") 'company-select-previous)

-    (define-key keymap (kbd "<down>") 'company-select-next)
-    (define-key keymap (kbd "<up>") 'company-select-previous)
+    (define-key keymap (kbd "<down>") 'company-select-next-or-abort)
+    (define-key keymap (kbd "<up>") 'company-select-previous-or-abort)

     (define-key keymap [down-mouse-1] 'ignore)
     (define-key keymap [down-mouse-3] 'ignore)
     (define-key keymap [mouse-1] 'company-complete-mouse)
     (define-key keymap [mouse-3] 'company-select-mouse)
     (define-key keymap [up-mouse-1] 'ignore)
     (define-key keymap [up-mouse-3] 'ignore)
     (define-key keymap [down-mouse-1] 'ignore)
     (define-key keymap [down-mouse-3] 'ignore)
     (define-key keymap [mouse-1] 'company-complete-mouse)
     (define-key keymap [mouse-3] 'company-select-mouse)
     (define-key keymap [up-mouse-1] 'ignore)
     (define-key keymap [up-mouse-3] 'ignore)

-    (define-key keymap "\C-m" 'company-complete-selection)
-    (define-key keymap "\t" 'company-complete-common)
+    (define-key keymap [return] 'company-complete-selection)
+    (define-key keymap (kbd "RET") 'company-complete-selection)
+    (define-key keymap [tab] 'company-complete-common)
+    (define-key keymap (kbd "TAB") 'company-complete-common)

     (define-key keymap (kbd "<f1>") 'company-show-doc-buffer)
     (define-key keymap "\C-w" 'company-show-location)
     (define-key keymap "\C-s" 'company-search-candidates)
     (define-key keymap (kbd "<f1>") 'company-show-doc-buffer)
     (define-key keymap "\C-w" 'company-show-location)
     (define-key keymap "\C-s" 'company-search-candidates)


@@ -563,7 +478,7 @@ The work-around consists of adding a newline.")
          (unless (memq backend company--disabled-backends)
            (message "Company back-end '%s' could not be initialized:\n%s"
                     backend (error-message-string err)))
          (unless (memq backend company--disabled-backends)
            (message "Company back-end '%s' could not be initialized:\n%s"
                     backend (error-message-string err)))

-         (push backend company--disabled-backends)
+         (pushnew backend company--disabled-backends)

          nil))
     (mapc 'company-init-backend backend)))
 
          nil))
     (mapc 'company-init-backend backend)))
 


@@ -574,7 +489,7 @@ The work-around consists of adding a newline.")
 
 ;;;###autoload
 (define-minor-mode company-mode
 
 ;;;###autoload
 (define-minor-mode company-mode

-  "\"complete anything\"; in in-buffer completion framework.
+  "\"complete anything\"; is an in-buffer completion framework.

 Completion starts automatically, depending on the values
 `company-idle-delay' and `company-minimum-prefix-length'.
 
 Completion starts automatically, depending on the values
 `company-idle-delay' and `company-minimum-prefix-length'.
 


@@ -587,9 +502,9 @@ Completions can be searched with `company-search-candidates' or
 `company-filter-candidates'.  These can be used while completion is
 inactive, as well.
 
 `company-filter-candidates'.  These can be used while completion is
 inactive, as well.
 

-The completion data is retrieved using `company-backends' and displayed using
-`company-frontends'.  If you want to start a specific back-end, call it
-interactively or use `company-begin-backend'.
+The completion data is retrieved using `company-backends' and displayed
+using `company-frontends'.  If you want to start a specific back-end, call
+it interactively or use `company-begin-backend'.

 
 regular keymap (`company-mode-map'):
 
 
 regular keymap (`company-mode-map'):
 


@@ -608,8 +523,12 @@ keymap during active completions (`company-active-map'):
     (company-cancel)
     (kill-local-variable 'company-point)))
 
     (company-cancel)
     (kill-local-variable 'company-point)))
 

-(define-globalized-minor-mode global-company-mode company-mode
-  (lambda () (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
 
 (defsubst company-assert-enabled ()
   (unless company-mode


@@ -618,31 +537,28 @@ keymap during active completions (`company-active-map'):
 
 ;;; keymaps ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 ;;; keymaps ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

-(defvar company-overriding-keymap-bound nil)
-(make-variable-buffer-local 'company-overriding-keymap-bound)
-
-(defvar company-old-keymap nil)
-(make-variable-buffer-local 'company-old-keymap)
-

 (defvar company-my-keymap nil)
 (make-variable-buffer-local 'company-my-keymap)
 
 (defvar company-my-keymap nil)
 (make-variable-buffer-local 'company-my-keymap)
 

+(defvar company-emulation-alist '((t . nil)))
+

 (defsubst company-enable-overriding-keymap (keymap)
 (defsubst company-enable-overriding-keymap (keymap)

-  (setq company-my-keymap keymap)
-  (when company-overriding-keymap-bound
-    (company-uninstall-map)))
+  (company-uninstall-map)
+  (setq company-my-keymap keymap))
+
+(defun company-ensure-emulation-alist ()
+  (unless (eq 'company-emulation-alist (car emulation-mode-map-alists))
+    (setq emulation-mode-map-alists
+          (cons 'company-emulation-alist
+                (delq 'company-emulation-alist emulation-mode-map-alists)))))

 
 (defun company-install-map ()
 
 (defun company-install-map ()

-  (unless (or company-overriding-keymap-bound
+  (unless (or (cdar company-emulation-alist)

               (null company-my-keymap))
               (null company-my-keymap))

-    (setq company-old-keymap overriding-terminal-local-map
-          overriding-terminal-local-map company-my-keymap
-          company-overriding-keymap-bound t)))
+    (setf (cdar company-emulation-alist) company-my-keymap)))

 
 (defun company-uninstall-map ()
 
 (defun company-uninstall-map ()

-  (when (eq overriding-terminal-local-map company-my-keymap)
-    (setq overriding-terminal-local-map company-old-keymap
-          company-overriding-keymap-bound nil)))
+  (setf (cdar company-emulation-alist) nil))

 
 ;; Hack:
 ;; Emacs calculates the active keymaps before reading the event.  That means we
 
 ;; Hack:
 ;; Emacs calculates the active keymaps before reading the event.  That means we


@@ -656,20 +572,29 @@ keymap during active completions (`company-active-map'):
 (defun company-input-noop ()
   (push 31415926 unread-command-events))
 
 (defun company-input-noop ()
   (push 31415926 unread-command-events))
 

-;; Hack:
-;; posn-col-row is incorrect in older Emacsen when line-spacing is set
-(defun company--col-row (&optional pos)
-  (let ((posn (posn-at-point pos)))
-    (cons (car (posn-col-row posn)) (cdr (posn-actual-col-row posn)))))
-
-(defsubst company--column (&optional pos)
-  (car (posn-col-row (posn-at-point pos))))
-
-(defsubst company--row (&optional pos)
-  (cdr (posn-actual-col-row (posn-at-point pos))))
+(defun company--column (&optional pos)
+  (save-excursion
+    (when pos (goto-char pos))
+    (let ((pt (point)))
+      (save-restriction
+        (+ (save-excursion
+             (vertical-motion 0)
+             (narrow-to-region (point) pt)
+             (let ((prefix (get-text-property (point) 'line-prefix)))
+               (if prefix (length prefix) 0)))
+           (current-column))))))
+
+(defun company--row (&optional pos)
+  (save-excursion
+    (when pos (goto-char pos))
+    (count-screen-lines (window-start)
+                        (progn (vertical-motion 0) (point)))))

 
 ;;; backends ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 ;;; backends ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

+(defvar company-backend nil)
+(make-variable-buffer-local 'company-backend)
+

 (defun company-grab (regexp &optional expression limit)
   (when (looking-back regexp limit)
     (or (match-string-no-properties (or expression 0)) "")))
 (defun company-grab (regexp &optional expression limit)
   (when (looking-back regexp limit)
     (or (match-string-no-properties (or expression 0)) "")))


@@ -715,23 +640,26 @@ keymap during active completions (`company-active-map'):
     (apply 'company--multi-backend-adapter company-backend args)))
 
 (defun company--multi-backend-adapter (backends command &rest args)
     (apply 'company--multi-backend-adapter company-backend args)))
 
 (defun company--multi-backend-adapter (backends command &rest args)

-  (case command
-    (candidates
-     (apply 'append (mapcar (lambda (backend) (apply backend command args))
-                            backends)))
-    (sorted nil)
-    (duplicates t)
-    (otherwise
-     (let (value)
-       (dolist (backend backends)
-         (when (setq value (apply backend command args))
-           (return value)))))))
+  (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
+             when (equal (funcall backend 'prefix)
+                         (car args))
+             append (apply backend 'candidates args)))
+      (sorted nil)
+      (duplicates t)
+      (otherwise
+       (let (value)
+         (dolist (backend backends)
+           (when (setq value (apply backend command args))
+             (return value))))))))

 
 ;;; completion mechanism ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 ;;; completion mechanism ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

-(defvar company-backend nil)
-(make-variable-buffer-local 'company-backend)
-

 (defvar company-prefix nil)
 (make-variable-buffer-local 'company-prefix)
 
 (defvar company-prefix nil)
 (make-variable-buffer-local 'company-prefix)
 


@@ -760,6 +688,10 @@ keymap during active completions (`company-active-map'):
   "Non-nil, if explicit completion took place.")
 (make-variable-buffer-local 'company--explicit-action)
 
   "Non-nil, if explicit completion took place.")
 (make-variable-buffer-local 'company--explicit-action)
 

+(defvar company--auto-completion nil
+  "Non-nil when current candidate is being completed automatically.
+Controlled by `company-auto-complete'.")
+

 (defvar company--point-max nil)
 (make-variable-buffer-local 'company--point-max)
 
 (defvar company--point-max nil)
 (make-variable-buffer-local 'company--point-max)
 


@@ -792,14 +724,15 @@ can retrieve meta-data for them."
   (or company--explicit-action
       company-selection-changed))
 
   (or company--explicit-action
       company-selection-changed))
 

-(defsubst company-reformat (candidate)
+(defun company-reformat (candidate)

   ;; company-ispell needs this, because the results are always lower-case
   ;; It's mory efficient to fix it only when they are displayed.
   (concat company-prefix (substring candidate (length company-prefix))))
 
 (defun company--should-complete ()
   (and (not (or buffer-read-only overriding-terminal-local-map
   ;; company-ispell needs this, because the results are always lower-case
   ;; It's mory efficient to fix it only when they are displayed.
   (concat company-prefix (substring candidate (length company-prefix))))
 
 (defun company--should-complete ()
   (and (not (or buffer-read-only overriding-terminal-local-map

-                overriding-local-map))
+                overriding-local-map
+                (minibufferp)))

        ;; Check if in the middle of entering a key combination.
        (or (equal (this-command-keys-vector) [])
            (not (keymapp (key-binding (this-command-keys-vector)))))
        ;; Check if in the middle of entering a key combination.
        (or (equal (this-command-keys-vector) [])
            (not (keymapp (key-binding (this-command-keys-vector)))))


@@ -809,14 +742,14 @@ can retrieve meta-data for them."
            (and (symbolp this-command) (get this-command 'company-begin)))
        (not (and transient-mark-mode mark-active))))
 
            (and (symbolp this-command) (get this-command 'company-begin)))
        (not (and transient-mark-mode mark-active))))
 

-(defsubst company-call-frontends (command)
+(defun company-call-frontends (command)

   (dolist (frontend company-frontends)
     (condition-case err
         (funcall frontend command)
       (error (error "Company: Front-end %s error \"%s\" on command %s"
                     frontend (error-message-string err) command)))))
 
   (dolist (frontend company-frontends)
     (condition-case err
         (funcall frontend command)
       (error (error "Company: Front-end %s error \"%s\" on command %s"
                     frontend (error-message-string err) command)))))
 

-(defsubst company-set-selection (selection &optional force-update)
+(defun company-set-selection (selection &optional force-update)

   (setq selection (max 0 (min (1- company-candidates-length) selection)))
   (when (or force-update (not (equal selection company-selection)))
     (setq company-selection selection
   (setq selection (max 0 (min (1- company-candidates-length) selection)))
   (when (or force-update (not (equal selection company-selection)))
     (setq company-selection selection


@@ -850,16 +783,22 @@ can retrieve meta-data for them."
   (push (cons company-prefix company-candidates) company-candidates-cache)
   ;; Calculate common.
   (let ((completion-ignore-case (company-call-backend 'ignore-case)))
   (push (cons company-prefix company-candidates) company-candidates-cache)
   ;; Calculate common.
   (let ((completion-ignore-case (company-call-backend 'ignore-case)))

-    (setq company-common (try-completion company-prefix company-candidates)))
+    (setq company-common (company--safe-candidate
+                          (try-completion company-prefix company-candidates))))

   (when (eq company-common t)
     (setq company-candidates nil)))
 
   (when (eq company-common t)
     (setq company-candidates nil)))
 

+(defun company--safe-candidate (str)
+  (or (company-call-backend 'crop str)
+      str))
+

 (defun company-calculate-candidates (prefix)
 (defun company-calculate-candidates (prefix)

-  (let ((candidates (cdr (assoc prefix company-candidates-cache))))
+  (let ((candidates (cdr (assoc prefix company-candidates-cache)))
+        (ignore-case (company-call-backend 'ignore-case)))

     (or candidates
         (when company-candidates-cache
           (let ((len (length prefix))
     (or candidates
         (when company-candidates-cache
           (let ((len (length prefix))

-                (completion-ignore-case (company-call-backend 'ignore-case))
+                (completion-ignore-case ignore-case)

                 prev)
             (dotimes (i (1+ len))
               (when (setq prev (cdr (assoc (substring prefix 0 (- len i))
                 prev)
             (dotimes (i (1+ len))
               (when (setq prev (cdr (assoc (substring prefix 0 (- len i))


@@ -881,12 +820,13 @@ can retrieve meta-data for them."
               (while c2
                 (setcdr c2 (progn (while (equal (pop c2) (car c2)))
                                   c2)))))))
               (while c2
                 (setcdr c2 (progn (while (equal (pop c2) (car c2)))
                                   c2)))))))

-    (if (or (cdr candidates)
-            (not (equal (car candidates) prefix)))
-        ;; Don't start when already completed and unique.
-        candidates
-      ;; Not the right place? maybe when setting?
-      (and company-candidates t))))
+    (when candidates
+      (if (or (cdr candidates)
+              (not (eq t (compare-strings (car candidates) nil nil
+                                          prefix nil nil ignore-case))))
+          candidates
+        ;; Already completed and unique; don't start.
+        t))))

 
 (defun company-idle-begin (buf win tick pos)
   (and company-mode
 
 (defun company-idle-begin (buf win tick pos)
   (and company-mode


@@ -917,7 +857,10 @@ can retrieve meta-data for them."
 (defun company-manual-begin ()
   (interactive)
   (setq company--explicit-action t)
 (defun company-manual-begin ()
   (interactive)
   (setq company--explicit-action t)

-  (company-auto-begin))
+  (unwind-protect
+      (company-auto-begin)
+    (unless company-candidates
+      (setq company--explicit-action nil))))

 
 (defun company-other-backend (&optional backward)
   (interactive (list current-prefix-arg))
 
 (defun company-other-backend (&optional backward)
   (interactive (list current-prefix-arg))


@@ -939,14 +882,10 @@ can retrieve meta-data for them."
 (defun company-require-match-p ()
   (let ((backend-value (company-call-backend 'require-match)))
     (or (eq backend-value t)
 (defun company-require-match-p ()
   (let ((backend-value (company-call-backend 'require-match)))
     (or (eq backend-value t)

-        (and (if (functionp company-require-match)
+        (and (not (eq backend-value 'never))
+             (if (functionp company-require-match)

                  (funcall company-require-match)
                  (funcall company-require-match)

-               (eq company-require-match t))
-             (not (eq backend-value 'never))))))
-
-(defun company-punctuation-p (input)
-  "Return non-nil, if input starts with punctuation or parentheses."
-  (memq (char-syntax (string-to-char input)) '(?. ?\( ?\))))
+               (eq company-require-match t))))))

 
 (defun company-auto-complete-p (input)
   "Return non-nil, if input starts with punctuation or parentheses."
 
 (defun company-auto-complete-p (input)
   "Return non-nil, if input starts with punctuation or parentheses."


@@ -980,12 +919,13 @@ can retrieve meta-data for them."
         ;; auto-complete
         (save-excursion
           (goto-char company-point)
         ;; auto-complete
         (save-excursion
           (goto-char company-point)

-          (company-complete-selection)
+          (let ((company--auto-completion t))
+            (company-complete-selection))

           nil))
        ((and (company--string-incremental-p company-prefix new-prefix)
              (company-require-match-p))
         ;; wrong incremental input, but required match
           nil))
        ((and (company--string-incremental-p company-prefix new-prefix)
              (company-require-match-p))
         ;; wrong incremental input, but required match

-        (backward-delete-char (length input))
+        (delete-char (- (length input)))

         (ding)
         (message "Matching input is required")
         company-candidates)
         (ding)
         (message "Matching input is required")
         company-candidates)


@@ -996,8 +936,10 @@ can retrieve meta-data for them."
 
 (defun company--good-prefix-p (prefix)
   (and (or (company-explicit-action-p)
 
 (defun company--good-prefix-p (prefix)
   (and (or (company-explicit-action-p)

-           (>= (or (cdr-safe prefix) (length prefix))
-               company-minimum-prefix-length))
+           (unless (eq prefix 'stop)
+             (or (eq (cdr-safe prefix) t)
+                 (>= (or (cdr-safe prefix) (length prefix))
+                     company-minimum-prefix-length))))

        (stringp (or (car-safe prefix) prefix))))
 
 (defun company--continue ()
        (stringp (or (car-safe prefix) prefix))))
 
 (defun company--continue ()


@@ -1058,15 +1000,15 @@ can retrieve meta-data for them."
         (return c)))))
 
 (defun company-begin ()
         (return c)))))
 
 (defun company-begin ()

-  (setq company-candidates
-        (or (and company-candidates (company--continue))
-            (and (company--should-complete) (company--begin-new))))
+  (or (and company-candidates (company--continue))
+      (and (company--should-complete) (company--begin-new)))

   (when company-candidates
     (when (and company-end-of-buffer-workaround (eobp))
       (save-excursion (insert "\n"))
       (setq company-added-newline (buffer-chars-modified-tick)))
     (setq company-point (point)
           company--point-max (point-max))
   (when company-candidates
     (when (and company-end-of-buffer-workaround (eobp))
       (save-excursion (insert "\n"))
       (setq company-added-newline (buffer-chars-modified-tick)))
     (setq company-point (point)
           company--point-max (point-max))

+    (company-ensure-emulation-alist)

     (company-enable-overriding-keymap company-active-map)
     (company-call-frontends 'update)))
 
     (company-enable-overriding-keymap company-active-map)
     (company-call-frontends 'update)))
 


@@ -1251,9 +1193,7 @@ can retrieve meta-data for them."
   (interactive)
   (company-search-assert-enabled)
   (company-search-mode 0)
   (interactive)
   (company-search-assert-enabled)
   (company-search-mode 0)

-  (when last-input-event
-    (clear-this-command-keys t)
-    (setq unread-command-events (list last-input-event))))
+  (company--unread-last-input))

 
 (defvar company-search-map
   (let ((i 0)
 
 (defvar company-search-map
   (let ((i 0)


@@ -1262,7 +1202,7 @@ can retrieve meta-data for them."
         (set-char-table-range (nth 1 keymap) (cons #x100 (max-char))
                               'company-search-printing-char)
       (with-no-warnings
         (set-char-table-range (nth 1 keymap) (cons #x100 (max-char))
                               'company-search-printing-char)
       (with-no-warnings

-        ;; obselete in Emacs 23
+        ;; obsolete in Emacs 23

         (let ((l (generic-character-list))
               (table (nth 1 keymap)))
           (while l
         (let ((l (generic-character-list))
               (table (nth 1 keymap)))
           (while l


@@ -1305,7 +1245,7 @@ Don't start this directly, use `company-search-candidates' or
     (kill-local-variable 'company-search-old-selection)
     (company-enable-overriding-keymap company-active-map)))
 
     (kill-local-variable 'company-search-old-selection)
     (company-enable-overriding-keymap company-active-map)))
 

-(defsubst company-search-assert-enabled ()
+(defun company-search-assert-enabled ()

   (company-assert-enabled)
   (unless company-search-mode
     (company-uninstall-map)
   (company-assert-enabled)
   (unless company-search-mode
     (company-uninstall-map)


@@ -1321,8 +1261,8 @@ Don't start this directly, use `company-search-candidates' or
 
 Regular characters are appended to the search string.
 
 
 Regular characters are appended to the search string.
 

-The command `company-search-kill-others' (\\[company-search-kill-others]) uses
- the search string to limit the completion candidates."
+The command `company-search-kill-others' (\\[company-search-kill-others])
+uses the search string to limit the completion candidates."

   (interactive)
   (company-search-mode 1)
   (company-enable-overriding-keymap company-search-map))
   (interactive)
   (company-search-mode 1)
   (company-enable-overriding-keymap company-search-map))


@@ -1357,14 +1297,76 @@ followed by `company-search-kill-others' after each input."
   (when (company-manual-begin)
     (company-set-selection (1- company-selection))))
 
   (when (company-manual-begin)
     (company-set-selection (1- company-selection))))
 

+(defun company-select-next-or-abort ()
+  "Select the next candidate if more than one, else abort
+and invoke the normal binding."
+  (interactive)
+  (if (> company-candidates-length 1)
+      (company-select-next)
+    (company-abort)
+    (company--unread-last-input)))
+
+(defun company-select-previous-or-abort ()
+  "Select the previous candidate if more than one, else abort
+and invoke the normal binding."
+  (interactive)
+  (if (> company-candidates-length 1)
+      (company-select-previous)
+    (company-abort)
+    (company--unread-last-input)))
+
+(defvar company-pseudo-tooltip-overlay)
+
+(defvar company-tooltip-offset)
+
+(defun company--inside-tooltip-p (event-col-row row height)
+  (let* ((ovl company-pseudo-tooltip-overlay)
+         (column (overlay-get ovl 'company-column))
+         (width (overlay-get ovl 'company-width))
+         (evt-col (car event-col-row))
+         (evt-row (cdr event-col-row)))
+    (and (>= evt-col column)
+         (< evt-col (+ column width))
+         (if (> height 0)
+             (and (> evt-row row)
+                  (<= evt-row (+ row height) ))
+           (and (< evt-row row)
+                (>= evt-row (+ row height)))))))
+
+(defun company--event-col-row (event)
+  (let* ((col-row (posn-actual-col-row (event-start event)))
+         (col (car col-row))
+         (row (cdr col-row)))
+    (incf col (window-hscroll))
+    (and header-line-format
+         (version< "24" emacs-version)
+         (decf row))
+    (cons col row)))
+

 (defun company-select-mouse (event)
   "Select the candidate picked by the mouse."
   (interactive "e")
 (defun company-select-mouse (event)
   "Select the candidate picked by the mouse."
   (interactive "e")

-  (when (nth 4 (event-start event))
-    (company-set-selection (- (cdr (posn-actual-col-row (event-start event)))
-                              (company--row)
-                              1))
-    t))
+  (let ((event-col-row (company--event-col-row event))
+        (ovl-row (company--row))
+        (ovl-height (and company-pseudo-tooltip-overlay
+                         (min (overlay-get company-pseudo-tooltip-overlay
+                                           'company-height)
+                              company-candidates-length))))
+    (if (and ovl-height
+             (company--inside-tooltip-p event-col-row ovl-row ovl-height))
+        (progn
+          (company-set-selection (+ (cdr event-col-row)
+                                    (if (zerop company-tooltip-offset)
+                                        -1
+                                      (- company-tooltip-offset 2))
+                                    (- ovl-row)
+                                    (if (< ovl-height 0)
+                                        (- 1 ovl-height)
+                                      0)))
+          t)
+      (company-abort)
+      (company--unread-last-input)
+      nil)))

 
 (defun company-complete-mouse (event)
   "Complete the candidate picked by the mouse."
 
 (defun company-complete-mouse (event)
   "Complete the candidate picked by the mouse."


@@ -1376,7 +1378,10 @@ followed by `company-search-kill-others' after each input."
   "Complete the selected candidate."
   (interactive)
   (when (company-manual-begin)
   "Complete the selected candidate."
   (interactive)
   (when (company-manual-begin)

-    (company-finish (nth company-selection company-candidates))))
+    (let ((result (nth company-selection company-candidates)))
+      (when company--auto-completion
+        (setq result (company--safe-candidate result)))
+      (company-finish result))))

 
 (defun company-complete-common ()
   "Complete the common part of all candidates."
 
 (defun company-complete-common ()
   "Complete the common part of all candidates."


@@ -1389,8 +1394,9 @@ followed by `company-search-kill-others' after each input."
 
 (defun company-complete ()
   "Complete the common part of all candidates or the current selection.
 
 (defun company-complete ()
   "Complete the common part of all candidates or the current selection.

-The first time this is called, the common part is completed, the second time, or
-when the selection has been changed, the selected candidate is completed."
+The first time this is called, the common part is completed, the second
+time, or when the selection has been changed, the selected candidate is
+completed."

   (interactive)
   (when (company-manual-begin)
     (if (or company-selection-changed
   (interactive)
   (when (company-manual-begin)
     (if (or company-selection-changed


@@ -1419,19 +1425,26 @@ To show the number next to the candidates in some back-ends, enable
       (push (make-string (- company-space-strings-limit 1 i) ?\  ) lst))
     (apply 'vector lst)))
 
       (push (make-string (- company-space-strings-limit 1 i) ?\  ) lst))
     (apply 'vector lst)))
 

-(defsubst company-space-string (len)
+(defun company-space-string (len)

   (if (< len company-space-strings-limit)
       (aref company-space-strings len)
     (make-string len ?\ )))
 
   (if (< len company-space-strings-limit)
       (aref company-space-strings len)
     (make-string len ?\ )))
 

-(defsubst company-safe-substring (str from &optional to)
-  (let ((len (length str)))
-    (if (> from len)
-        ""
-      (if (and to (> to len))
-          (concat (substring str from)
-                  (company-space-string (- to len)))
-        (substring str from to)))))
+(defun company-safe-substring (str from &optional to)
+  (if (> from (string-width str))
+      ""
+    (with-temp-buffer
+      (insert str)
+      (move-to-column from)
+      (let ((beg (point)))
+        (if to
+            (progn
+              (move-to-column to)
+              (concat (buffer-substring beg (point))
+                      (let ((padding (- to (current-column))))
+                        (when (> padding 0)
+                          (company-space-string padding)))))
+          (buffer-substring beg (point-max)))))))

 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 


@@ -1446,8 +1459,11 @@ To show the number next to the candidates in some back-ends, enable
     (cdr company-last-metadata)))
 
 (defun company-doc-buffer (&optional string)
     (cdr company-last-metadata)))
 
 (defun company-doc-buffer (&optional string)

-  (with-current-buffer (get-buffer-create "*Company meta-data*")
+  (with-current-buffer (get-buffer-create "*company-documentation*")

     (erase-buffer)
     (erase-buffer)

+    (when string
+      (save-excursion
+        (insert string)))

     (current-buffer)))
 
 (defvar company--electric-commands
     (current-buffer)))
 
 (defvar company--electric-commands


@@ -1468,12 +1484,15 @@ To show the number next to the candidates in some back-ends, enable
          (while (memq (setq cmd (key-binding (vector (list (read-event)))))
                       company--electric-commands)
            (call-interactively cmd))
          (while (memq (setq cmd (key-binding (vector (list (read-event)))))
                       company--electric-commands)
            (call-interactively cmd))

-         (when last-input-event
-           (clear-this-command-keys t)
-           (setq unread-command-events (list last-input-event)))))))
+         (company--unread-last-input)))))
+
+(defun company--unread-last-input ()
+  (when last-input-event
+    (clear-this-command-keys t)
+    (setq unread-command-events (list last-input-event))))

 
 (defun company-show-doc-buffer ()
 
 (defun company-show-doc-buffer ()

-  "Temporarily show a buffer with the complete documentation for the selection."
+  "Temporarily show the documentation buffer for the selection."

   (interactive)
   (company--electric-do
     (let* ((selected (nth company-selection company-candidates))
   (interactive)
   (company--electric-do
     (let* ((selected (nth company-selection company-candidates))


@@ -1532,19 +1551,23 @@ To show the number next to the candidates in some back-ends, enable
   (setq company-backend backend)
   ;; Return non-nil if active.
   (or (company-manual-begin)
   (setq company-backend backend)
   ;; Return non-nil if active.
   (or (company-manual-begin)

-      (error "Cannot complete at point")))
+      (progn
+        (setq company-backend nil)
+        (error "Cannot complete at point"))))

 
 (defun company-begin-with (candidates
                            &optional prefix-length require-match callback)
   "Start a completion at point.
 
 (defun company-begin-with (candidates
                            &optional prefix-length require-match callback)
   "Start a completion at point.

-CANDIDATES is the list of candidates to use and PREFIX-LENGTH is the length of
-the prefix that already is in the buffer before point.  It defaults to 0.
+CANDIDATES is the list of candidates to use and PREFIX-LENGTH is the length
+of the prefix that already is in the buffer before point.
+It defaults to 0.

 
 

-CALLBACK is a function called with the selected result if the user successfully
-completes the input.
+CALLBACK is a function called with the selected result if the user
+successfully completes the input.

 
 

-Example:
-\(company-begin-with '\(\"foo\" \"foobar\" \"foobarbaz\"\)\)"
+Example: \(company-begin-with '\(\"foo\" \"foobar\" \"foobarbaz\"\)\)"
+  ;; FIXME: When Emacs 23 is no longer a concern, replace
+  ;; `company-begin-with-marker' with a lexical variable; use a lexical closure.

   (setq company-begin-with-marker (copy-marker (point) t))
   (company-begin-backend
    `(lambda (command &optional arg &rest ignored)
   (setq company-begin-with-marker (copy-marker (point) t))
   (company-begin-backend
    `(lambda (command &optional arg &rest ignored)


@@ -1635,17 +1658,28 @@ Example:
 
 (defun company-buffer-lines (beg end)
   (goto-char beg)
 
 (defun company-buffer-lines (beg end)
   (goto-char beg)

-  (let ((row (company--row))
-        lines)
-    (while (and (equal (move-to-window-line (incf row)) row)
+  (let (lines)
+    (while (and (= 1 (vertical-motion 1))

                 (<= (point) end))
                 (<= (point) end))

-      (push (buffer-substring beg (min end (1- (point)))) lines)
+      (let ((bound (min end (1- (point)))))
+        ;; A visual line can contain several physical lines (e.g. with outline's
+        ;; folding overlay).  Take only the first one.
+        (push (buffer-substring beg
+                                (save-excursion
+                                  (goto-char beg)
+                                  (re-search-forward "$" bound 'move)
+                                  (point)))
+              lines))

       (setq beg (point)))
     (unless (eq beg end)
       (push (buffer-substring beg end) lines))
     (nreverse lines)))
 
       (setq beg (point)))
     (unless (eq beg end)
       (push (buffer-substring beg end) lines))
     (nreverse lines)))
 

-(defsubst company-modify-line (old new offset)
+(defun company-modify-line (old new offset)
+  (let ((prefix (get-text-property 0 'line-prefix old)))
+    (when prefix ; Keep the original value unmodified, for no special reason.
+      (setq old (concat prefix old))
+      (remove-text-properties 0 (length old) '(line-prefix) old)))

   (concat (company-safe-substring old 0 offset)
           new
           (company-safe-substring old (+ offset (length new)))))
   (concat (company-safe-substring old 0 offset)
           new
           (company-safe-substring old (+ offset (length new)))))


@@ -1657,14 +1691,16 @@ Example:
 
 (defun company--replacement-string (lines old column nl &optional align-top)
 
 
 (defun company--replacement-string (lines old column nl &optional align-top)
 

-  (let ((width (length (car lines))))
-    (when (> width (- (window-width) column))
-      (setq column (max 0 (- (window-width) width)))))
+  (let ((width (length (car lines)))
+        (remaining-cols (- (+ (window-width) (window-hscroll))
+                           column)))
+    (when (> width remaining-cols)
+      (decf column (- width remaining-cols))))

 
   (let (new)
     (when align-top
       ;; untouched lines first
 
   (let (new)
     (when align-top
       ;; untouched lines first

-      (dotimes (i (- (length old) (length lines)))
+      (dotimes (_ (- (length old) (length lines)))

         (push (pop old) new)))
     ;; length into old lines.
     (while old
         (push (pop old) new)))
     ;; length into old lines.
     (while old


@@ -1672,9 +1708,12 @@ Example:
     ;; Append whole new lines.
     (while lines
       (push (concat (company-space-string column) (pop lines)) new))
     ;; Append whole new lines.
     (while lines
       (push (concat (company-space-string column) (pop lines)) new))

-    (concat (when nl "\n")
-            (mapconcat 'identity (nreverse new) "\n")
-            "\n")))
+
+    (let ((str (concat (when nl "\n")
+                       (mapconcat 'identity (nreverse new) "\n")
+                       "\n")))
+      (font-lock-append-text-property 0 (length str) 'face 'default str)
+      str)))

 
 (defun company--create-lines (selection limit)
 
 
 (defun company--create-lines (selection limit)
 


@@ -1703,7 +1742,7 @@ Example:
           len (min limit len)
           lines-copy lines)
 
           len (min limit len)
           lines-copy lines)
 

-    (dotimes (i len)
+    (dotimes (_ len)

       (setq width (max (length (pop lines-copy)) width)))
     (setq width (min width (window-width)))
 
       (setq width (max (length (pop lines-copy)) width)))
     (setq width (min width (window-width)))
 


@@ -1740,13 +1779,13 @@ Example:
 ;; show
 
 (defsubst company--window-inner-height ()
 ;; show
 
 (defsubst company--window-inner-height ()

-  (let ((edges (window-inside-edges (selected-window))))
+  (let ((edges (window-inside-edges)))

     (- (nth 3 edges) (nth 1 edges))))
 
     (- (nth 3 edges) (nth 1 edges))))
 

-(defsubst company--pseudo-tooltip-height ()
+(defun company--pseudo-tooltip-height ()

   "Calculate the appropriate tooltip height.
 Returns a negative number if the tooltip should be displayed above point."
   "Calculate the appropriate tooltip height.
 Returns a negative number if the tooltip should be displayed above point."

-  (let* ((lines (count-lines (window-start) (point-at-bol)))
+  (let* ((lines (company--row))

          (below (- (company--window-inner-height) 1 lines)))
     (if (and (< below (min company-tooltip-minimum company-candidates-length))
              (> lines below))
          (below (- (company--window-inner-height) 1 lines)))
     (if (and (< below (min company-tooltip-minimum company-candidates-length))
              (> lines below))


@@ -1757,8 +1796,6 @@ Returns a negative number if the tooltip should be displayed above point."
   (company-pseudo-tooltip-hide)
   (save-excursion
 
   (company-pseudo-tooltip-hide)
   (save-excursion
 

-    (move-to-column 0)
-

     (let* ((height (company--pseudo-tooltip-height))
            above)
 
     (let* ((height (company--pseudo-tooltip-height))
            above)
 


@@ -1778,27 +1815,25 @@ Returns a negative number if the tooltip should be displayed above point."
 
         (setq company-pseudo-tooltip-overlay ov)
         (overlay-put ov 'company-replacement-args args)
 
         (setq company-pseudo-tooltip-overlay ov)
         (overlay-put ov 'company-replacement-args args)

-        (overlay-put ov 'company-before
-                     (apply 'company--replacement-string
-                            (company--create-lines selection (abs height))
-                            args))
+
+        (let ((lines (company--create-lines selection (abs height))))
+          (overlay-put ov 'company-before
+                       (apply 'company--replacement-string lines args))
+          (overlay-put ov 'company-width (string-width (car lines))))

 
         (overlay-put ov 'company-column column)
 
         (overlay-put ov 'company-column column)

-        (overlay-put ov 'company-height (abs height))
-        (overlay-put ov 'window (selected-window))))))
+        (overlay-put ov 'company-height height)))))

 
 (defun company-pseudo-tooltip-show-at-point (pos)
 
 (defun company-pseudo-tooltip-show-at-point (pos)

-  (let ((col-row (company--col-row pos)))
-    (when col-row
-      (company-pseudo-tooltip-show (1+ (cdr col-row)) (car col-row)
-                                   company-selection))))
-
-(defun company-pseudo-tooltip-edit (lines selection)
-  (let ((column (overlay-get company-pseudo-tooltip-overlay 'company-column))
-        (height (overlay-get company-pseudo-tooltip-overlay 'company-height)))
+  (let ((row (company--row pos))
+        (col (company--column pos)))
+    (company-pseudo-tooltip-show (1+ row) col company-selection)))
+
+(defun company-pseudo-tooltip-edit (selection)
+  (let ((height (overlay-get company-pseudo-tooltip-overlay 'company-height)))

     (overlay-put company-pseudo-tooltip-overlay 'company-before
                  (apply 'company--replacement-string
     (overlay-put company-pseudo-tooltip-overlay 'company-before
                  (apply 'company--replacement-string

-                        (company--create-lines selection height)
+                        (company--create-lines selection (abs height))

                         (overlay-get company-pseudo-tooltip-overlay
                                      'company-replacement-args)))))
 
                         (overlay-get company-pseudo-tooltip-overlay
                                      'company-replacement-args)))))
 


@@ -1815,12 +1850,20 @@ Returns a negative number if the tooltip should be displayed above point."
 (defun company-pseudo-tooltip-unhide ()
   (when company-pseudo-tooltip-overlay
     (overlay-put company-pseudo-tooltip-overlay 'invisible t)
 (defun company-pseudo-tooltip-unhide ()
   (when company-pseudo-tooltip-overlay
     (overlay-put company-pseudo-tooltip-overlay 'invisible t)

+    ;; Beat outline's folding overlays, at least.
+    (overlay-put company-pseudo-tooltip-overlay 'priority 1)
+    ;; No (extra) prefix for the first line.
+    (overlay-put company-pseudo-tooltip-overlay 'line-prefix "")

     (overlay-put company-pseudo-tooltip-overlay 'before-string
                  (overlay-get company-pseudo-tooltip-overlay 'company-before))
     (overlay-put company-pseudo-tooltip-overlay 'window (selected-window))))
 
     (overlay-put company-pseudo-tooltip-overlay 'before-string
                  (overlay-get company-pseudo-tooltip-overlay 'company-before))
     (overlay-put company-pseudo-tooltip-overlay 'window (selected-window))))
 

+(defun company-pseudo-tooltip-guard ()
+  (buffer-substring-no-properties
+   (point) (overlay-start company-pseudo-tooltip-overlay)))
+

 (defun company-pseudo-tooltip-frontend (command)
 (defun company-pseudo-tooltip-frontend (command)

-  "A `company-mode' front-end similar to a tool-tip but based on overlays."
+  "`company-mode' front-end similar to a tooltip but based on overlays."

   (case command
     (pre-command (company-pseudo-tooltip-hide-temporarily))
     (post-command
   (case command
     (pre-command (company-pseudo-tooltip-hide-temporarily))
     (post-command


@@ -1830,16 +1873,20 @@ Returns a negative number if the tooltip should be displayed above point."
                          0))
            (new-height (company--pseudo-tooltip-height)))
        (unless (and (>= (* old-height new-height) 0)
                          0))
            (new-height (company--pseudo-tooltip-height)))
        (unless (and (>= (* old-height new-height) 0)

-                    (>= (abs old-height) (abs new-height)))
+                    (>= (abs old-height) (abs new-height))
+                    (equal (company-pseudo-tooltip-guard)
+                           (overlay-get company-pseudo-tooltip-overlay
+                                        'company-guard)))

          ;; Redraw needed.
          (company-pseudo-tooltip-show-at-point (- (point)
          ;; Redraw needed.
          (company-pseudo-tooltip-show-at-point (- (point)

-                                                  (length company-prefix)))))
+                                                  (length company-prefix)))
+         (overlay-put company-pseudo-tooltip-overlay
+                      'company-guard (company-pseudo-tooltip-guard))))

      (company-pseudo-tooltip-unhide))
     (hide (company-pseudo-tooltip-hide)
      (company-pseudo-tooltip-unhide))
     (hide (company-pseudo-tooltip-hide)

-           (setq company-tooltip-offset 0))
+          (setq company-tooltip-offset 0))

     (update (when (overlayp company-pseudo-tooltip-overlay)
     (update (when (overlayp company-pseudo-tooltip-overlay)

-               (company-pseudo-tooltip-edit company-candidates
-                                            company-selection)))))
+              (company-pseudo-tooltip-edit company-selection)))))

 
 (defun company-pseudo-tooltip-unless-just-one-frontend (command)
   "`company-pseudo-tooltip-frontend', but not shown for single candidates."
 
 (defun company-pseudo-tooltip-unless-just-one-frontend (command)
   "`company-pseudo-tooltip-frontend', but not shown for single candidates."


@@ -1885,7 +1932,7 @@ Returns a negative number if the tooltip should be displayed above point."
     (setq company-preview-overlay nil)))
 
 (defun company-preview-frontend (command)
     (setq company-preview-overlay nil)))
 
 (defun company-preview-frontend (command)

-  "A `company-mode' front-end showing the selection as if it had been inserted."
+  "`company-mode' front-end showing the selection as if it had been inserted."

   (case command
     (pre-command (company-preview-hide))
     (post-command (company-preview-show-at-point (point)))
   (case command
     (pre-command (company-preview-hide))
     (post-command (company-preview-show-at-point (point)))


@@ -1914,11 +1961,14 @@ Returns a negative number if the tooltip should be displayed above point."
         (message "%s" company-echo-last-msg)
       (message ""))))
 
         (message "%s" company-echo-last-msg)
       (message ""))))
 

-(defsubst company-echo-show-soon (&optional getter)
+(defun company-echo-show-soon (&optional getter)

   (when company-echo-timer
     (cancel-timer company-echo-timer))
   (when company-echo-timer
     (cancel-timer company-echo-timer))

-  (setq company-echo-timer (run-with-timer company-echo-delay nil
-                                           'company-echo-show getter)))
+  (setq company-echo-timer (run-with-timer 0 nil 'company-echo-show getter)))
+
+(defsubst company-echo-show-when-idle (&optional getter)
+  (when (sit-for company-echo-delay)
+    (company-echo-show getter)))

 
 (defun company-echo-format ()
 
 
 (defun company-echo-format ()
 


@@ -1976,36 +2026,27 @@ Returns a negative number if the tooltip should be displayed above point."
             "}")))
 
 (defun company-echo-hide ()
             "}")))
 
 (defun company-echo-hide ()

-  (when company-echo-timer
-    (cancel-timer company-echo-timer))

   (unless (equal company-echo-last-msg "")
     (setq company-echo-last-msg "")
     (company-echo-show)))
 
 (defun company-echo-frontend (command)
   (unless (equal company-echo-last-msg "")
     (setq company-echo-last-msg "")
     (company-echo-show)))
 
 (defun company-echo-frontend (command)

-  "A `company-mode' front-end showing the candidates in the echo area."
+  "`company-mode' front-end showing the candidates in the echo area."

   (case command
   (case command

-    (pre-command (company-echo-show-soon))

     (post-command (company-echo-show-soon 'company-echo-format))
     (hide (company-echo-hide))))
 
 (defun company-echo-strip-common-frontend (command)
     (post-command (company-echo-show-soon 'company-echo-format))
     (hide (company-echo-hide))))
 
 (defun company-echo-strip-common-frontend (command)

-  "A `company-mode' front-end showing the candidates in the echo area."
+  "`company-mode' front-end showing the candidates in the echo area."

   (case command
   (case command

-    (pre-command (company-echo-show-soon))

     (post-command (company-echo-show-soon 'company-echo-strip-common-format))
     (hide (company-echo-hide))))
 
 (defun company-echo-metadata-frontend (command)
     (post-command (company-echo-show-soon 'company-echo-strip-common-format))
     (hide (company-echo-hide))))
 
 (defun company-echo-metadata-frontend (command)

-  "A `company-mode' front-end showing the documentation in the echo area."
+  "`company-mode' front-end showing the documentation in the echo area."

   (case command
   (case command

-    (pre-command (company-echo-show-soon))
-    (post-command (company-echo-show-soon 'company-fetch-metadata))
+    (post-command (company-echo-show-when-idle 'company-fetch-metadata))

     (hide (company-echo-hide))))
 
     (hide (company-echo-hide))))
 

-;; templates ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(autoload 'company-template-declare-template "company-template")
-

 (provide 'company)
 ;;; company.el ends here
 (provide 'company)
 ;;; company.el ends here