[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 265eb38 16/38: Merge pull request #967 from taigacute/mast
From: |
Dmitry Gutov |
Subject: |
[elpa] master 265eb38 16/38: Merge pull request #967 from taigacute/master |
Date: |
Sat, 25 Jul 2020 19:51:13 -0400 (EDT) |
branch: master
commit 265eb38e7b635fae4880fafeb7e53d50535988f5
Merge: d091704 fdbdff3
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>
Merge pull request #967 from taigacute/master
Improve the behavior
---
company-yasnippet.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/company-yasnippet.el b/company-yasnippet.el
index 14ed8e3..f7753bc 100644
--- a/company-yasnippet.el
+++ b/company-yasnippet.el
@@ -107,10 +107,15 @@ It has to accept one argument: the snippet's name.")
(defun company-yasnippet--doc (arg)
(let ((template (get-text-property 0 'yas-template arg))
- (mode major-mode))
+ (mode major-mode)
+ (file-name (buffer-file-name)))
(with-current-buffer (company-doc-buffer)
+ (setq-local buffer-file-name file-name)
(yas-minor-mode 1)
- (yas-expand-snippet (yas--template-content template))
+ (condition-case error
+ (yas-expand-snippet (yas--template-content template))
+ (error
+ (message "%s" (error-message-string error))))
(delay-mode-hooks
(let ((inhibit-message t))
(if (eq mode 'web-mode)
- [elpa] master updated (e58daf7 -> 6a39f31), Dmitry Gutov, 2020/07/25
- [elpa] master ec1a742 01/38: Stop overriding post-completion, Dmitry Gutov, 2020/07/25
- [elpa] master d40bcfc 06/38: add the docbuffer on company-yasnippet, Dmitry Gutov, 2020/07/25
- [elpa] master cdd2c00 10/38: use eq instead of string-equal, Dmitry Gutov, 2020/07/25
- [elpa] master 4af1ea2 12/38: company-yasnippet: Make annotation more customizable, Dmitry Gutov, 2020/07/25
- [elpa] master d091704 13/38: Update copyright years, Dmitry Gutov, 2020/07/25
- [elpa] master fdbdff3 15/38: catch yas-expand-snippet error, Dmitry Gutov, 2020/07/25
- [elpa] master 265eb38 16/38: Merge pull request #967 from taigacute/master,
Dmitry Gutov <=
- [elpa] master e3d7d60 02/38: company-bbdb: Support more headers like From:, Dmitry Gutov, 2020/07/25
- [elpa] master 94e22c4 03/38: Merge pull request #958 from OGAWAHirofumi/company-bbdb-add-more-header, Dmitry Gutov, 2020/07/25
- [elpa] master f275ee6 04/38: Fix Travis CI Build config, Dmitry Gutov, 2020/07/25
- [elpa] master 872b14c 05/38: add the docbuffer on company-yasnippet, Dmitry Gutov, 2020/07/25
- [elpa] master 32e535d 07/38: add syntax highlight, Dmitry Gutov, 2020/07/25
- [elpa] master e585f63 08/38: Merge pull request #963 from tsuu32/fix/travis-ci, Dmitry Gutov, 2020/07/25
- [elpa] master 3262c18 09/38: use symbol-value to get major-mode value, Dmitry Gutov, 2020/07/25
- [elpa] master 033358c 11/38: Merge pull request #965 from taigacute/master, Dmitry Gutov, 2020/07/25
- [elpa] master 04d3766 14/38: config the company-yasnippet-doc buffer-file-name, Dmitry Gutov, 2020/07/25
- [elpa] master e25c459 18/38: let-bind buffer-file-name instead of setting it, Dmitry Gutov, 2020/07/25