[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/yasnippet-classic-snippets 4651676 2/4: Fix loading of
From: |
Stefan Monnier |
Subject: |
[elpa] externals/yasnippet-classic-snippets 4651676 2/4: Fix loading of yasnippet-classic-snippets |
Date: |
Tue, 1 Dec 2020 09:50:30 -0500 (EST) |
branch: externals/yasnippet-classic-snippets
commit 46516764acf680b79575d55299e2a32e38bfda18
Author: Noam Postavsky <npostavs@users.sourceforge.net>
Commit: Noam Postavsky <npostavs@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/yasnippet-classic-snippets.el b/yasnippet-classic-snippets.el
index 9ef6f4e..b0a3864 100644
--- a/yasnippet-classic-snippets.el
+++ b/yasnippet-classic-snippets.el
@@ -2,8 +2,9 @@
;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Maintainer: Noam Postavsky <npostavs@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)