[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e94f2ec 008/173: company-show-doc-buffer: Still call doc-b
From: |
Dmitry Gutov |
Subject: |
[elpa] master e94f2ec 008/173: company-show-doc-buffer: Still call doc-buffer inside the electric block |
Date: |
Thu, 23 Jun 2016 00:28:34 +0000 (UTC) |
branch: master
commit e94f2ecb20c1653a9b27fe4163e5b1291f6d7ed7
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
company-show-doc-buffer: Still call doc-buffer inside the electric block
#309
---
company.el | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/company.el b/company.el
index eb32267..3ef045d 100644
--- a/company.el
+++ b/company.el
@@ -2045,14 +2045,15 @@ character, stripping the modifiers. That character
must be a digit."
(defun company-show-doc-buffer ()
"Temporarily show the documentation buffer for the selection."
(interactive)
- (let* ((selected (nth company-selection company-candidates))
- (doc-buffer (or (company-call-backend 'doc-buffer selected)
- (error "No documentation available")))
- (other-window-scroll-buffer (get-buffer doc-buffer)))
+ (let (other-window-scroll-buffer)
(company--electric-do
- (with-current-buffer doc-buffer
- (goto-char (point-min)))
- (display-buffer doc-buffer t))))
+ (let* ((selected (nth company-selection company-candidates))
+ (doc-buffer (or (company-call-backend 'doc-buffer selected)
+ (error "No documentation available"))))
+ (setq other-window-scroll-buffer (get-buffer doc-buffer))
+ (with-current-buffer doc-buffer
+ (goto-char (point-min)))
+ (display-buffer doc-buffer t)))))
(put 'company-show-doc-buffer 'company-keep t)
(defun company-show-location ()
- [elpa] master updated (24149b0 -> 7a2deff), Dmitry Gutov, 2016/06/22
- [elpa] master 448bcd8 007/173: company-show-doc-buffer: Bind other-window-scroll-buffer, Dmitry Gutov, 2016/06/22
- [elpa] master dae79c4 002/173: Merge branch 'search-hl-fix', Dmitry Gutov, 2016/06/22
- [elpa] master 12f55f5 013/173: Buf was unused, Dmitry Gutov, 2016/06/22
- [elpa] master e94f2ec 008/173: company-show-doc-buffer: Still call doc-buffer inside the electric block,
Dmitry Gutov <=
- [elpa] master 125a4da 009/173: company-show-location: Mirror the latest change to company-show-doc-buffer, Dmitry Gutov, 2016/06/22
- [elpa] master 7941f6e 010/173: company-diag: Include Emacs and Company versions, Dmitry Gutov, 2016/06/22
- [elpa] master 5733f2b 011/173: company-diag: Fix the annotation call, Dmitry Gutov, 2016/06/22
- [elpa] master af962d4 012/173: company-diag: Call `annotation' in the right buffer, Dmitry Gutov, 2016/06/22
- [elpa] master 5e107fd 015/173: Accept numeric argument in company-select-next and friends, Dmitry Gutov, 2016/06/22
- [elpa] master 479c676 021/173: Don't use `forward-symbol', apparently it's not in 24.3, Dmitry Gutov, 2016/06/22
- [elpa] master 41f4536 018/173: Add missing require to `company-gtags`, Dmitry Gutov, 2016/06/22
- [elpa] master b0f206a 020/173: Handle function pointers in annotation and template expansion, Dmitry Gutov, 2016/06/22
- [elpa] master d56ddaa 006/173: Allow scrolling the doc window with the mouse wheel, Dmitry Gutov, 2016/06/22
- [elpa] master a7a4ba6 014/173: Merge branch 'release', Dmitry Gutov, 2016/06/22