branch: master
commit b8687bb0fe817a1eda657ff7b8511dc523ae9536
Author: Noam Postavsky <[email protected]>
Commit: Noam Postavsky <[email protected]>
Avoid double snippet loading messages
* yasnippet.el (yas--load-directory-1): Message about loading compiled
snippets only after successfully doing so.
Close #627.
---
yasnippet.el | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index f13dc4f..facb2b6 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1779,9 +1779,9 @@ With prefix argument USE-JIT do jit-loading of snippets."
(current-time-string)))))
;; Normal case.
(unless (file-exists-p (concat directory "/" ".yas-skip"))
- (if (and (progn (yas--message 2 "Loading compiled snippets from %s"
directory) t)
- (load (expand-file-name ".yas-compiled-snippets" directory)
'noerror (<= yas-verbosity 3)))
- (yas--message 2 "Loading snippet files from %s" directory)
+ (unless (and (load (expand-file-name ".yas-compiled-snippets" directory)
'noerror (<= yas-verbosity 3))
+ (progn (yas--message 2 "Loaded compiled snippets from %s"
directory) t))
+ (yas--message 2 "Loading snippet files from %s" directory)
(yas--load-directory-2 directory mode-sym)))))
(defun yas--load-directory-2 (directory mode-sym)