[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1a98c38 59/60: Fix silly mistake in previous commit
From: |
João Távora |
Subject: |
[elpa] master 1a98c38 59/60: Fix silly mistake in previous commit |
Date: |
Thu, 21 Jan 2016 22:36:09 +0000 |
branch: master
commit 1a98c38d9cac584a56cefd74612eefb335e89325
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Fix silly mistake in previous commit
* yasnippet.el (yas--load-snippet-dirs): Put `make-directory' call in
same branch of the `if' as the `dolist' loop.
---
yasnippet.el | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index bd1d864..dcec0e2 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1805,18 +1805,18 @@ With prefix argument USE-JIT do jit-loading of
snippets."
"Reload the directories listed in `yas-snippet-dirs' or
prompt the user to select one."
(let (errors)
- (if yas-snippet-dirs
- (when (member yas--default-user-snippets-dir yas-snippet-dirs)
- (make-directory yas--default-user-snippets-dir t))
- (dolist (directory (reverse (yas-snippet-dirs)))
- (cond ((file-directory-p directory)
- (yas-load-directory directory (not nojit))
- (if nojit
- (yas--message 3 "Loaded %s" directory)
- (yas--message 3 "Prepared just-in-time loading for %s"
directory)))
- (t
- (push (yas--message 0 "Check your `yas-snippet-dirs': %s is
not a directory" directory) errors))))
- (call-interactively 'yas-load-directory))
+ (if (null yas-snippet-dirs)
+ (call-interactively 'yas-load-directory)
+ (when (member yas--default-user-snippets-dir yas-snippet-dirs)
+ (make-directory yas--default-user-snippets-dir t))
+ (dolist (directory (reverse (yas-snippet-dirs)))
+ (cond ((file-directory-p directory)
+ (yas-load-directory directory (not nojit))
+ (if nojit
+ (yas--message 3 "Loaded %s" directory)
+ (yas--message 3 "Prepared just-in-time loading for %s"
directory)))
+ (t
+ (push (yas--message 0 "Check your `yas-snippet-dirs': %s is not
a directory" directory) errors)))))
errors))
(defun yas-reload-all (&optional no-jit interactive)
- [elpa] master 61261c9 53/60: Fix #576; don't override yas-prompt-functions, (continued)
- [elpa] master 61261c9 53/60: Fix #576; don't override yas-prompt-functions, João Távora, 2016/01/21
- [elpa] master a2c5292 55/60: Bless Noam Postavsky as the new official maintainer, João Távora, 2016/01/21
- [elpa] master cd05da6 36/60: Activate extra and major modes first, João Távora, 2016/01/21
- [elpa] master 3cd64b7 45/60: yasnippet.el (yas--called-interactively-p): Remove., João Távora, 2016/01/21
- [elpa] master 140c415 52/60: Respect y-b-l-cond from binding triggered snippets, João Távora, 2016/01/21
- [elpa] master 71f0142 50/60: Improve test simulatulation of self-insert, João Távora, 2016/01/21
- [elpa] master e6fff09 54/60: Don't choose ido prompting based on Emacs version, João Távora, 2016/01/21
- [elpa] master af90528 56/60: Fix debugging code for newer Emacsen, João Távora, 2016/01/21
- [elpa] master 100d8d1 57/60: Fix bug reporting examples., João Távora, 2016/01/21
- [elpa] master 46256db 58/60: Fix #648; create ~/.emacs.d/snippets automatically, João Távora, 2016/01/21
- [elpa] master 1a98c38 59/60: Fix silly mistake in previous commit,
João Távora <=
- [elpa] master 5817fe1 60/60: Update packages/yasnippet by subtree-merging from its external upstream, João Távora, 2016/01/21