emacs-elpa-diffs
[Top][All Lists]
Advanced

[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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]