[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e25c459 18/38: let-bind buffer-file-name instead of settin
From: |
Dmitry Gutov |
Subject: |
[elpa] master e25c459 18/38: let-bind buffer-file-name instead of setting it |
Date: |
Sat, 25 Jul 2020 19:51:14 -0400 (EDT) |
branch: master
commit e25c45963707dbfad0fd6389fa6420c96cac643b
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>
let-bind buffer-file-name instead of setting it
---
company-yasnippet.el | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/company-yasnippet.el b/company-yasnippet.el
index f7753bc..c2c2688 100644
--- a/company-yasnippet.el
+++ b/company-yasnippet.el
@@ -110,20 +110,20 @@ It has to accept one argument: the snippet's name.")
(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)
- (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)
+ (let ((buffer-file-name file-name))
+ (yas-minor-mode 1)
+ (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)
(progn
(setq mode 'html-mode)
(funcall mode))
- (funcall mode)))
- (ignore-errors (font-lock-ensure)))
+ (funcall mode)))
+ (ignore-errors (font-lock-ensure))))
(current-buffer))))
;;;###autoload
- [elpa] master 265eb38 16/38: Merge pull request #967 from taigacute/master, (continued)
- [elpa] master 265eb38 16/38: Merge pull request #967 from taigacute/master, Dmitry Gutov, 2020/07/25
- [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 <=
- [elpa] master d38d64b 20/38: Keyworks complete for c++-mode and c-mode, Dmitry Gutov, 2020/07/25
- [elpa] master b9b0577 22/38: Make company-auto-complete condition more reliable, Dmitry Gutov, 2020/07/25
- [elpa] master 56a846c 25/38: Add a NEWS entry, Dmitry Gutov, 2020/07/25
- [elpa] master 6cf5169 23/38: Update copyright years, Dmitry Gutov, 2020/07/25
- [elpa] master c59c85b 24/38: Merge branch 'master' into company-tng-with-post-completion, Dmitry Gutov, 2020/07/25
- [elpa] master e93b3dc 30/38: [company-files] Make post-completion command a dedicated function, Dmitry Gutov, 2020/07/25
- [elpa] master 1c7a872 31/38: Merge pull request #983 from qhuyduong/make-post-completion-command-dedicated-function, Dmitry Gutov, 2020/07/25
- [elpa] master 6a39f31 38/38: Merge commit '656ad10670512e135a0a5881f127bb7a789ef8ca' from company, Dmitry Gutov, 2020/07/25
- [elpa] master 955f80e 19/38: company-doc-buffer: Make sure to reset the major mode, Dmitry Gutov, 2020/07/25
- [elpa] master db0596b 26/38: Merge branch 'master' of github.com:company-mode/company-mode, Dmitry Gutov, 2020/07/25