]> code.delx.au - gnu-emacs-elpa/commitdiff
Fix silly mistake in previous commit
authorNoam Postavsky <npostavs@users.sourceforge.net>
Wed, 20 Jan 2016 14:44:28 +0000 (09:44 -0500)
committerNoam Postavsky <npostavs@users.sourceforge.net>
Wed, 20 Jan 2016 14:44:28 +0000 (09:44 -0500)
* yasnippet.el (yas--load-snippet-dirs): Put `make-directory' call in
  same branch of the `if' as the `dolist' loop.

yasnippet.el

index bd1d864a94dcab6a0ba9e651626e2a6a35db1399..dcec0e2589ae12cd6f6cff0113acff13405e06a1 100644 (file)
@@ -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)