[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 5ab7f42 64/66: Merge pull request #838 from bet4it/restore
From: |
Dmitry Gutov |
Subject: |
[elpa] master 5ab7f42 64/66: Merge pull request #838 from bet4it/restore-point |
Date: |
Mon, 5 Nov 2018 18:19:24 -0500 (EST) |
branch: master
commit 5ab7f42cb3ba75e80f0d8cadcdbf05bdffbd6b76
Merge: afbaad1 4fa5a37
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #838 from bet4it/restore-point
Restore point before backends are called
---
company.el | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/company.el b/company.el
index 1259b6c..f05aaf5 100644
--- a/company.el
+++ b/company.el
@@ -2827,7 +2827,6 @@ Returns a negative number if the tooltip should be
displayed above point."
(defun company-pseudo-tooltip-show (row column selection)
(company-pseudo-tooltip-hide)
- (save-excursion
(let* ((height (company--pseudo-tooltip-height))
above)
@@ -2836,15 +2835,17 @@ Returns a negative number if the tooltip should be
displayed above point."
(setq row (+ row height -1)
above t))
- (let* ((nl (< (move-to-window-line row) row))
- (beg (point))
- (end (save-excursion
- (move-to-window-line (+ row (abs height)))
- (point)))
- (ov (make-overlay beg end nil t))
- (args (list (mapcar 'company-plainify
- (company-buffer-lines beg end))
- column nl above)))
+ (let (nl beg end ov args)
+ (save-excursion
+ (setq nl (< (move-to-window-line row) row)
+ beg (point)
+ end (save-excursion
+ (move-to-window-line (+ row (abs height)))
+ (point))
+ ov (make-overlay beg end nil t)
+ args (list (mapcar 'company-plainify
+ (company-buffer-lines beg end))
+ column nl above)))
(setq company-pseudo-tooltip-overlay ov)
(overlay-put ov 'company-replacement-args args)
@@ -2855,7 +2856,7 @@ Returns a negative number if the tooltip should be
displayed above point."
(overlay-put ov 'company-width (string-width (car lines))))
(overlay-put ov 'company-column column)
- (overlay-put ov 'company-height height)))))
+ (overlay-put ov 'company-height height))))
(defun company-pseudo-tooltip-show-at-point (pos column-offset)
(let* ((col-row (company--col-row pos))
- [elpa] master 382764a 34/66: Merge pull request #798 from joaotavora/master, (continued)
- [elpa] master 382764a 34/66: Merge pull request #798 from joaotavora/master, Dmitry Gutov, 2018/11/05
- [elpa] master 87f479b 59/66: Merge pull request #829 from chunzhouyu/master, Dmitry Gutov, 2018/11/05
- [elpa] master 7c6357a 60/66: Define variable alias before referent, Dmitry Gutov, 2018/11/05
- [elpa] master 88b8282 58/66: add nil and bool to company-keywords for go-mode, Dmitry Gutov, 2018/11/05
- [elpa] master 4fe0bec 57/66: Merge pull request #828 from chunzhouyu/master, Dmitry Gutov, 2018/11/05
- [elpa] master 4fa5a37 63/66: Backends are called at the same point where company begins, Dmitry Gutov, 2018/11/05
- [elpa] master ed8bf2a 56/66: capitalize the comment sentences, Dmitry Gutov, 2018/11/05
- [elpa] master c95a6b4 65/66: Release 0.9.7, Dmitry Gutov, 2018/11/05
- [elpa] master 1e22493 66/66: Merge commit 'c95a6b41d621de4253b77e512aa61fc0e75acddc' from company, Dmitry Gutov, 2018/11/05
- [elpa] master ffba418 26/66: Merge pull request #802 from wyuenho/update-keywords, Dmitry Gutov, 2018/11/05
- [elpa] master 5ab7f42 64/66: Merge pull request #838 from bet4it/restore-point,
Dmitry Gutov <=
- [elpa] master f31d284 33/66: Mention #798 in NEWS.md, Dmitry Gutov, 2018/11/05
- [elpa] master d0fab46 36/66: Properly fix #809, Dmitry Gutov, 2018/11/05
- [elpa] master 7e20ee4 43/66: update go-mode's keywords sort, Dmitry Gutov, 2018/11/05
- [elpa] master 2bcaa2e 55/66: add some refs, Dmitry Gutov, 2018/11/05
- [elpa] master afbaad1 62/66: company-ispell-available: Better error message, Dmitry Gutov, 2018/11/05
- [elpa] master 24bbc85 35/66: Fix #809 by looking up `face' as well, Dmitry Gutov, 2018/11/05
- [elpa] master 1f836b6 37/66: Merge pull request #810 from joaotavora/master, Dmitry Gutov, 2018/11/05
- [elpa] master 3162aa2 47/66: Update company-keywords.el, Dmitry Gutov, 2018/11/05
- [elpa] master b423ba4 48/66: Merge pull request #819 from chunzhouyu/master, Dmitry Gutov, 2018/11/05
- [elpa] master a163e94 49/66: Improve comment, Dmitry Gutov, 2018/11/05