[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 14/28: Work around http://debbugs.gnu.org/18285
From: |
Dmitry Gutov |
Subject: |
[elpa] 14/28: Work around http://debbugs.gnu.org/18285 |
Date: |
Wed, 27 Aug 2014 01:26:27 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit bb0a1d57ae2dc4b8778dd594c85b557f3198dd0b
Author: Dmitry Gutov <address@hidden>
Date: Mon Aug 18 05:14:17 2014 +0400
Work around http://debbugs.gnu.org/18285
Closes #136
---
company.el | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/company.el b/company.el
index f5598cc..e9ada82 100644
--- a/company.el
+++ b/company.el
@@ -2408,7 +2408,7 @@ Returns a negative number if the tooltip should be
displayed above point."
(overlay-put ov 'company-replacement-args args)
(let ((lines (company--create-lines selection (abs height))))
- (overlay-put ov 'company-after
+ (overlay-put ov 'company-display
(apply 'company--replacement-string lines args))
(overlay-put ov 'company-width (string-width (car lines))))
@@ -2426,7 +2426,7 @@ Returns a negative number if the tooltip should be
displayed above point."
(lines (company--create-lines selection (abs height))))
(overlay-put company-pseudo-tooltip-overlay 'company-width
(string-width (car lines)))
- (overlay-put company-pseudo-tooltip-overlay 'company-after
+ (overlay-put company-pseudo-tooltip-overlay 'company-display
(apply 'company--replacement-string
lines
(overlay-get company-pseudo-tooltip-overlay
@@ -2439,19 +2439,17 @@ Returns a negative number if the tooltip should be
displayed above point."
(defun company-pseudo-tooltip-hide-temporarily ()
(when (overlayp company-pseudo-tooltip-overlay)
- (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)))
(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 'after-string
- (overlay-get company-pseudo-tooltip-overlay 'company-after))
+ (overlay-put company-pseudo-tooltip-overlay 'display
+ (overlay-get company-pseudo-tooltip-overlay 'company-display))
(overlay-put company-pseudo-tooltip-overlay 'window (selected-window))))
(defun company-pseudo-tooltip-guard ()
- [elpa] 07/28: company--window-inner-height: remove, use `window-body-height', (continued)
- [elpa] 07/28: company--window-inner-height: remove, use `window-body-height', Dmitry Gutov, 2014/08/26
- [elpa] 02/28: company-dabbrev--search-buffer: Use `syntax-ppss' to get to the beg of str-or-cmt, Dmitry Gutov, 2014/08/26
- [elpa] 04/28: Remove the "download ERT" logic; should be unused at this point, Dmitry Gutov, 2014/08/26
- [elpa] 08/28: Assign a face for the tooltip search string, Dmitry Gutov, 2014/08/26
- [elpa] 09/28: Merge pull request #164 from holomorph/tooltip-search, Dmitry Gutov, 2014/08/26
- [elpa] 10/28: Mention company-tooltip-search in NEWS, Dmitry Gutov, 2014/08/26
- [elpa] 11/28: Use window-screen-lines when available, Dmitry Gutov, 2014/08/26
- [elpa] 05/28: company--show-inline-p: never ignore case, Dmitry Gutov, 2014/08/26
- [elpa] 12/28: Tweak wording, Dmitry Gutov, 2014/08/26
- [elpa] 13/28: Use `posn-actual-col-row' to determine the current col and row, Dmitry Gutov, 2014/08/26
- [elpa] 14/28: Work around http://debbugs.gnu.org/18285,
Dmitry Gutov <=
- [elpa] 16/28: company-buffer-lines: handle multiline display better, Dmitry Gutov, 2014/08/26
- [elpa] 17/28: company-input-noop still seems to be needed in the terminal, Dmitry Gutov, 2014/08/26
- [elpa] 18/28: Skip company-buffer-lines tests in terminal, Dmitry Gutov, 2014/08/26
- [elpa] 19/28: company-pseudo-tooltip-unhide: use local vars, Dmitry Gutov, 2014/08/26
- [elpa] 20/28: company-pseudo-tooltip-unhide: fix rendering at eob, Dmitry Gutov, 2014/08/26
- [elpa] 15/28: Fix the tests, Dmitry Gutov, 2014/08/26
- [elpa] 21/28: Add a comment, Dmitry Gutov, 2014/08/26
- [elpa] 22/28: company--capf-data: use caching, Dmitry Gutov, 2014/08/26
- [elpa] 24/28: Use `company-dabbrev-ignore-case' when searching for candidates, Dmitry Gutov, 2014/08/26
- [elpa] 25/28: Document `company-dabbrev-ignore-case' better, Dmitry Gutov, 2014/08/26