[elpa] master c5788f7: Fix loading of yasnippet-classic-snippets

[Noam Postavsky]

branch: master
commit c5788f7a09d365df7431528b7711dd5171eb9ea5
Author: Noam Postavsky <npost...@users.sourceforge.net>
Commit: Noam Postavsky <npost...@users.sourceforge.net>

    Fix loading of yasnippet-classic-snippets
    
    * packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el:
    Don't require yasnippet.  Handle old single string format of
    yas-snippet-dirs.  Make sure yasnippet-classic-snippets-dir is
    actually defined when we use it.  Bump version to 1.0.1.
---
 .../yasnippet-classic-snippets.el                    | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el 
b/packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el
index 9ef6f4e..b0a3864 100644
--- a/packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el
+++ b/packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el
@@ -2,8 +2,9 @@
 
 ;; Copyright (C) 2018 Free Software Foundation, Inc.
 
+;; Maintainer: Noam Postavsky <npost...@gmail.com>
 ;; Keywords: snippets
-;; Version: 1.0.0
+;; Version: 1.0.1
 ;; Package-Requires: ((yasnippet "0.9.1"))
 ;; Keywords: convenience, snippets
 
@@ -28,18 +29,23 @@
 
 ;;; Code:
 
-(require 'yasnippet)
-
 (defconst yasnippet-classic-snippets-dir
   (expand-file-name
    "snippets"
    (file-name-directory (or load-file-name buffer-file-name))))
 
-;;;###autoload
 (eval-after-load 'yasnippet
-  '(unless (memq 'yasnippet-classic-snippets-dir yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs 'yasnippet-classic-snippets-dir t)
-    (yas-load-directory yasnippet-classic-snippets-dir)))
+  '(progn
+     (when (stringp yas-snippet-dirs)
+       ;; In case the user set the old format.
+       (setq yas-snippet-dirs (list yas-snippet-dirs)))
+     (unless (memq 'yasnippet-classic-snippets-dir yas-snippet-dirs)
+       ;; Prepare for future snippet reloads.
+       (add-to-list 'yas-snippet-dirs 'yasnippet-classic-snippets-dir t)
+       ;; And get our snippets ready now.
+       (yas-load-directory yasnippet-classic-snippets-dir t))))
+
+;;;###autoload (eval-after-load 'yasnippet '(require 
'yasnippet-classic-snippets))
 
 (provide 'yasnippet-classic-snippets)