Load correct .yas-setup and .yas-compiled-snippets file when loading a snippet dir

diff --git a/yasnippet.el b/yasnippet.el
index d1af979f7918015d1d8afb42f67036c206f9697e..5056372f60052cb88ad48274cc591cf5f5ab791e 100644 (file)
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1606,9 +1606,9 @@ TEMPLATES is a list of `yas/template'."
   (unless (file-exists-p (concat directory "/" ".yas-skip"))
     ;; Load .yas-setup.el files wherever we find them
     ;;
-    (load ".yas-setup" 'noerror)
+    (load (expand-file-name ".yas-setup" directory) 'noerror)
     (if (and (not no-compiled-snippets)
-             (load ".yas-compiled-snippets" 'noerror))
+             (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror))
         (message "Loading much faster .yas-compiled-snippets from %s" directory)
       (let* ((major-mode-and-parents (if mode-sym
                                          (cons mode-sym parents)