[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 68b0ab6 20/60: Accept documented snippet list formats
From: |
João Távora |
Subject: |
[elpa] master 68b0ab6 20/60: Accept documented snippet list formats |
Date: |
Thu, 21 Jan 2016 22:35:55 +0000 |
branch: master
commit 68b0ab66ca3668846a8931774bef46c49dda1149
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Accept documented snippet list formats
yas-define-snippets was making assumptions that happended to be true for
its current calls, but could fail if given differently formatted snippet
lists that still meet the docstring description.
* yasnippet.el (yas-define-snippets): Handle incomplete snippet lists.
---
yasnippet.el | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index e580426..1fd08e2 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1660,11 +1660,13 @@ the current buffers contents."
(let ((print-length nil))
(insert ";;; Snippet definitions:\n;;;\n")
(dolist (snippet snippets)
+ ;; Fill in missing elements with nil.
+ (setq snippet (append snippet (make-list (- 10 (length snippet))
nil)))
;; Move LOAD-FILE to SAVE-FILE because we will load from the
;; compiled file, not LOAD-FILE.
- (let ((load-file-cell (nthcdr 6 snippet)))
- (setcdr (last snippet) (list (car load-file-cell)))
- (setcar (nthcdr 6 snippet) nil)))
+ (let ((load-file (nth 6 snippet)))
+ (setcar (nthcdr 6 snippet) nil)
+ (setcar (nthcdr 9 snippet) load-file)))
(insert (pp-to-string
`(yas-define-snippets ',mode ',snippets)))
(insert "\n\n"))
- [elpa] master 4692c81 09/60: Fix "invalid function: quote", (continued)
- [elpa] master 4692c81 09/60: Fix "invalid function: quote", João Távora, 2016/01/21
- [elpa] master 5ebf347 11/60: Minor doc fixes, João Távora, 2016/01/21
- [elpa] master 197db9f 10/60: Merge pull request #578 from aluaces/patch-1, João Távora, 2016/01/21
- [elpa] master 7f4f6be 07/60: Merge pull request #571 from PhilHudson/master, João Távora, 2016/01/21
- [elpa] master c91a588 14/60: Simplify some code, João Távora, 2016/01/21
- [elpa] master 7bce1a6 12/60: Add new function yas-lookup-snippet, João Távora, 2016/01/21
- [elpa] master e8934ce 13/60: Merge pull request #596 from npostavs/lookup-snippet, João Távora, 2016/01/21
- [elpa] master 0ada0fc 15/60: Add documentation for snippet compilation, João Távora, 2016/01/21
- [elpa] master 4bd3d98 16/60: Merge pull request #599 from zmwangx/snippet-compilation-doc, João Távora, 2016/01/21
- [elpa] master 2f6cfef 17/60: Closes #601: updated snippets submodule, João Távora, 2016/01/21
- [elpa] master 68b0ab6 20/60: Accept documented snippet list formats,
João Távora <=
- [elpa] master cc1c758 18/60: Reorganize snippet construction from list code, João Távora, 2016/01/21
- [elpa] master 01139a2 23/60: * yasnippet.el (yas--define-snippets-2): Use file-name-NONdirectory., João Távora, 2016/01/21
- [elpa] master 8df6a6e 25/60: Fix invalid yas-key-syntaxes element warning, João Távora, 2016/01/21
- [elpa] master 7703a55 24/60: * doc/snippet-organization.org (.yas-skip): Add info., João Távora, 2016/01/21
- [elpa] master 041821a 22/60: * yasnippet-tests.el (string-suffix-p): Define for older Emacsen., João Távora, 2016/01/21
- [elpa] master fb6ec67 29/60: Fix #619; find parents for extra-modes too, João Távora, 2016/01/21
- [elpa] master 710ea4d 26/60: Update snippets module, João Távora, 2016/01/21
- [elpa] master 215ad9b 19/60: Fix #597; use SAVE-FILE to visit compiled snippets, João Távora, 2016/01/21
- [elpa] master e3f03ca 21/60: Test visiting compiled snippets, João Távora, 2016/01/21
- [elpa] master e56aa6f 28/60: Build a single `explored' list., João Távora, 2016/01/21