[elpa] master d4b45ba 5/5: Merge commit '490d3e4e7ef3fbc90fb3e8747f902bf839a924cc' from company

[Dmitry Gutov]

branch: master
commit d4b45bae9aad98783e5bb1d711391892b29857b4
Merge: a800c5d 490d3e4
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Merge commit '490d3e4e7ef3fbc90fb3e8747f902bf839a924cc' from company
---
 packages/company/NEWS.md    | 10 ++++++++--
 packages/company/company.el | 11 ++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/company/NEWS.md b/packages/company/NEWS.md
index 7be2dd2..45ab42a 100644
--- a/packages/company/NEWS.md
+++ b/packages/company/NEWS.md
@@ -1,5 +1,12 @@
 # History of user-visible changes
 
+## 2020-02-07 (0.9.12)
+
+* Tooltip rendering bugfix.
+* `company-indent-or-complete-common` is better compatible with
+  `indent-for-tab-command`
+  
([comment](https://github.com/company-mode/company-mode/issues/94#issuecomment-571265393)).
+
 ## 2020-01-03 (0.9.11)
 
 * New value for option `company-show-numbers` to show numbers on the left.
@@ -13,8 +20,7 @@
 * Snippet/template field interaction is inhibited while completion is active
   (where by default `TAB` calls `company-complete-common`, clashing with 
snippet
   map binding `TAB` to "jump to the next field"). Affects both
-  `company-template` and `yasnippet` (requires changes from 2019-04-21,
-  currently unreleased).
+  `company-template` and `yasnippet` (requires version 0.14.0).
 
 ## 2019-04-15 (0.9.10)
 
diff --git a/packages/company/company.el b/packages/company/company.el
index f80fc1d..0b9dbe7 100644
--- a/packages/company/company.el
+++ b/packages/company/company.el
@@ -5,7 +5,7 @@
 ;; Author: Nikolaj Schumacher
 ;; Maintainer: Dmitry Gutov <address@hidden>
 ;; URL: http://company-mode.github.io/
-;; Version: 0.9.11
+;; Version: 0.9.12
 ;; Keywords: abbrev, convenience, matching
 ;; Package-Requires: ((emacs "24.3"))
 
@@ -2171,9 +2171,9 @@ With ARG, move by that many elements."
               (current-prefix-arg arg))
           (call-interactively 'company-select-next))))))
 
-(defun company-indent-or-complete-common ()
+(defun company-indent-or-complete-common (arg)
   "Indent the current line or region, or complete the common part."
-  (interactive)
+  (interactive "P")
   (cond
    ((use-region-p)
     (indent-region (region-beginning) (region-end)))
@@ -2183,7 +2183,7 @@ With ARG, move by that many elements."
    ((let ((old-point (point))
           (old-tick (buffer-chars-modified-tick))
           (tab-always-indent t))
-      (call-interactively #'indent-for-tab-command)
+      (indent-for-tab-command arg)
       (when (and (eq old-point (point))
                  (eq old-tick (buffer-chars-modified-tick)))
         (company-complete-common))))))
@@ -2933,7 +2933,8 @@ Returns a negative number if the tooltip should be 
displayed above point."
     (overlay-put company-pseudo-tooltip-overlay 'invisible nil)
     (overlay-put company-pseudo-tooltip-overlay 'line-prefix nil)
     (overlay-put company-pseudo-tooltip-overlay 'after-string nil)
-    (overlay-put company-pseudo-tooltip-overlay 'display nil)))
+    (overlay-put company-pseudo-tooltip-overlay 'display nil)
+    (overlay-put company-pseudo-tooltip-overlay 'face nil)))
 
 (defun company-pseudo-tooltip-unhide ()
   (when company-pseudo-tooltip-overlay