]> code.delx.au - gnu-emacs-elpa/commitdiff
Merge branch 'master' into jit-loading
authorJoão Távora <joaotavora@gmail.com>
Sun, 25 Mar 2012 13:08:20 +0000 (14:08 +0100)
committerJoão Távora <joaotavora@gmail.com>
Sun, 25 Mar 2012 13:08:20 +0000 (14:08 +0100)
1  2 
yasnippet.el

diff --cc yasnippet.el
index b01f75b31b890530dfd45f2de6428ca6d61692c9,d9c3882cde5c42a877b1f207dbd1a1b18ea2f6df..6966ea1138e889582357eb14f541a36beb403bfd
@@@ -1660,12 -1656,19 +1662,19 @@@ Below TOP-LEVEL-DIR., each directory i
  (defun yas/load-snippet-dirs ()
    "Reload the directories listed in `yas/snippet-dirs' or
     prompt the user to select one."
-   (if yas/snippet-dirs
-       (dolist (directory (reverse (yas/snippet-dirs)))
-         (yas/load-directory directory))
-     (call-interactively 'yas/load-directory)))
+   (let (errors)
+     (if yas/snippet-dirs
+         (dolist (directory (reverse (yas/snippet-dirs)))
+           (condition-case oops
+               (progn
+                 (yas/load-directory directory)
+                 (message "[yas] Loaded %s" directory))
+             (error (push oops errors)
+                    (message "[yas] Check your `yas/snippet-dirs': %s" (second oops)))))
+       (call-interactively 'yas/load-directory))
+     errors))
  
 -(defun yas/reload-all (&optional interactive)
 +(defun yas/reload-all (&optional with-jit)
    "Reload all snippets and rebuild the YASnippet menu. "
    (interactive "p")
    (let ((errors))