From: João Távora Date: Sat, 28 Mar 2015 15:16:36 +0000 (+0000) Subject: Update packages/yasnippet by merging from its external upstream subtree X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/39a27b6cd6ced60e81145efb18d72d6081eac9f7 Update packages/yasnippet by merging from its external upstream subtree The snippet collection and the "yasmate" tool, realized in the upstream as git submodules, are removed in the merge result. The "old" snippet collection is however still in place in packages/yasnippet/snippets. Conflicts: .gitignore packages/yasnippet/doc/manual.mdown packages/yasnippet/extras/bundles/html-tmbundle packages/yasnippet/extras/bundles/rails-tmbundle packages/yasnippet/extras/bundles/ruby-tmbundle packages/yasnippet/extras/imported/html-mode/.yas-setup.el packages/yasnippet/extras/imported/objc-mode/.yas-setup.el packages/yasnippet/extras/imported/objc-mode/Support/alldefs.txt packages/yasnippet/extras/imported/rails-mode/.yas-setup.el packages/yasnippet/extras/imported/ruby-mode/.yas-setup.el packages/yasnippet/extras/textmate_import.rb packages/yasnippet/snippets/c++-mode/.yas-parents packages/yasnippet/snippets/c++-mode/beginend packages/yasnippet/snippets/c++-mode/class packages/yasnippet/snippets/c++-mode/ns packages/yasnippet/snippets/c++-mode/template packages/yasnippet/snippets/c++-mode/using packages/yasnippet/snippets/c-mode/.yas-parents packages/yasnippet/snippets/c-mode/fopen packages/yasnippet/snippets/c-mode/printf packages/yasnippet/snippets/cc-mode/.yas-parents packages/yasnippet/snippets/cc-mode/do packages/yasnippet/snippets/cc-mode/for packages/yasnippet/snippets/cc-mode/if packages/yasnippet/snippets/cc-mode/inc packages/yasnippet/snippets/cc-mode/inc.1 packages/yasnippet/snippets/cc-mode/main packages/yasnippet/snippets/cc-mode/once packages/yasnippet/snippets/cc-mode/struct packages/yasnippet/snippets/cperl-mode/.yas-parents packages/yasnippet/snippets/csharp-mode/.yas-parents packages/yasnippet/snippets/csharp-mode/attrib packages/yasnippet/snippets/csharp-mode/attrib.1 packages/yasnippet/snippets/csharp-mode/attrib.2 packages/yasnippet/snippets/csharp-mode/class packages/yasnippet/snippets/csharp-mode/comment packages/yasnippet/snippets/csharp-mode/comment.1 packages/yasnippet/snippets/csharp-mode/comment.2 packages/yasnippet/snippets/csharp-mode/comment.3 packages/yasnippet/snippets/csharp-mode/method packages/yasnippet/snippets/csharp-mode/namespace packages/yasnippet/snippets/csharp-mode/prop packages/yasnippet/snippets/csharp-mode/region packages/yasnippet/snippets/csharp-mode/using packages/yasnippet/snippets/csharp-mode/using.1 packages/yasnippet/snippets/csharp-mode/using.2 packages/yasnippet/snippets/css-mode/.yas-parents packages/yasnippet/snippets/css-mode/bg packages/yasnippet/snippets/css-mode/bg.1 packages/yasnippet/snippets/css-mode/bor packages/yasnippet/snippets/css-mode/cl packages/yasnippet/snippets/css-mode/disp.block packages/yasnippet/snippets/css-mode/disp.inline packages/yasnippet/snippets/css-mode/disp.none packages/yasnippet/snippets/css-mode/ff packages/yasnippet/snippets/css-mode/fs packages/yasnippet/snippets/css-mode/mar.bottom packages/yasnippet/snippets/css-mode/mar.left packages/yasnippet/snippets/css-mode/mar.mar packages/yasnippet/snippets/css-mode/mar.margin packages/yasnippet/snippets/css-mode/mar.right packages/yasnippet/snippets/css-mode/mar.top packages/yasnippet/snippets/css-mode/pad.bottom packages/yasnippet/snippets/css-mode/pad.left packages/yasnippet/snippets/css-mode/pad.pad packages/yasnippet/snippets/css-mode/pad.padding packages/yasnippet/snippets/css-mode/pad.right packages/yasnippet/snippets/css-mode/pad.top packages/yasnippet/snippets/emacs-lisp-mode/.read_me packages/yasnippet/snippets/emacs-lisp-mode/.yas-parents packages/yasnippet/snippets/emacs-lisp-mode/add-hook.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/and.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/append.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/apply.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/aref.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/aset.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/assq.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/autoload.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/backward-char.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/beginning-of-line.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/bounds-of-thing-at-point.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/buffer-file-name.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/buffer-modified-p.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/buffer-substring.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/car.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/cdr.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/concat.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/cond.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/condition-case.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/cons.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/consp.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/copy-directory.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/copy-file.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/current-buffer.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/custom-autoload.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/defalias.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/defcustom.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/define-key.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/defsubst.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/defun.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/defvar.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/delete-char.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/delete-directory.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/delete-file.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/delete-region.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/directory-files.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/dolist.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/end-of-line.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/eq.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/equal.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/error.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/expand-file-name.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/f.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/fboundp.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/file-name-directory.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/file-name-extension.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/file-name-sans-extension.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/file-relative-name.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/find-file.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/format.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/forward-char.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/forward-line.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/funcall.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/function.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/get.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/global-set-key.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/goto-char.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/if.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/insert-file-contents.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/insert.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/interactive.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/kbd.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/kill-buffer.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/lambda.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/length.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/let.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/line-beginning-position.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/line-end-position.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/list.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/looking-at.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/make-directory.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/make-local-variable.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/mapc.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/mapcar.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/match-beginning.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/match-end.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/match-string.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/memq.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/message.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/not.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/nth.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/null.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/number-to-string.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/or.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/point-max.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/point-min.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/point.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/princ.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/print.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/progn.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/push.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/put.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/re-search-backward.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/re-search-forward.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/region-active-p.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/region-beginning.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/region-end.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/rename-file.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/repeat.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/replace-regexp.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/require.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/save-buffer.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/save-excursion.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/search-backward-regexp.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/search-backward.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/search-forward-regexp.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/search-forward.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/set-buffer.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/set-file-modes.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/set-mark.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/set.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/setq.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/split-string.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/string-match.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/string-to-number.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/string.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/string=.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/stringp.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/substring.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/thing-at-point.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/unless.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/vector.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/when.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/while.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/widget-get.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/with-current-buffer.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-file.process.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-find-replace.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-grabstring.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-grabthing.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/x-word-or-region.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/y-or-n-p.yasnippet packages/yasnippet/snippets/emacs-lisp-mode/yes-or-no-p.yasnippet packages/yasnippet/snippets/erlang-mode/.yas-parents packages/yasnippet/snippets/erlang-mode/after packages/yasnippet/snippets/erlang-mode/begin packages/yasnippet/snippets/erlang-mode/beh packages/yasnippet/snippets/erlang-mode/case packages/yasnippet/snippets/erlang-mode/compile packages/yasnippet/snippets/erlang-mode/def packages/yasnippet/snippets/erlang-mode/exp packages/yasnippet/snippets/erlang-mode/fun packages/yasnippet/snippets/erlang-mode/if packages/yasnippet/snippets/erlang-mode/ifdef packages/yasnippet/snippets/erlang-mode/ifndef packages/yasnippet/snippets/erlang-mode/imp packages/yasnippet/snippets/erlang-mode/inc packages/yasnippet/snippets/erlang-mode/inc.lib packages/yasnippet/snippets/erlang-mode/loop packages/yasnippet/snippets/erlang-mode/mod packages/yasnippet/snippets/erlang-mode/rcv packages/yasnippet/snippets/erlang-mode/rcv.after packages/yasnippet/snippets/erlang-mode/rec packages/yasnippet/snippets/erlang-mode/try packages/yasnippet/snippets/erlang-mode/undef packages/yasnippet/snippets/f90-mode/.yas-parents packages/yasnippet/snippets/f90-mode/au packages/yasnippet/snippets/f90-mode/bd packages/yasnippet/snippets/f90-mode/c packages/yasnippet/snippets/f90-mode/ch packages/yasnippet/snippets/f90-mode/cx packages/yasnippet/snippets/f90-mode/dc packages/yasnippet/snippets/f90-mode/do packages/yasnippet/snippets/f90-mode/dp packages/yasnippet/snippets/f90-mode/eq packages/yasnippet/snippets/f90-mode/ib packages/yasnippet/snippets/f90-mode/ic packages/yasnippet/snippets/f90-mode/ich packages/yasnippet/snippets/f90-mode/if packages/yasnippet/snippets/f90-mode/ii packages/yasnippet/snippets/f90-mode/il packages/yasnippet/snippets/f90-mode/in packages/yasnippet/snippets/f90-mode/inc packages/yasnippet/snippets/f90-mode/intr packages/yasnippet/snippets/f90-mode/ir packages/yasnippet/snippets/f90-mode/l packages/yasnippet/snippets/f90-mode/pa packages/yasnippet/snippets/f90-mode/pr packages/yasnippet/snippets/f90-mode/re packages/yasnippet/snippets/f90-mode/st packages/yasnippet/snippets/f90-mode/su packages/yasnippet/snippets/f90-mode/wr packages/yasnippet/snippets/html-mode/.yas-parents packages/yasnippet/snippets/html-mode/b.yasnippet packages/yasnippet/snippets/html-mode/body packages/yasnippet/snippets/html-mode/br packages/yasnippet/snippets/html-mode/code packages/yasnippet/snippets/html-mode/code.class packages/yasnippet/snippets/html-mode/div packages/yasnippet/snippets/html-mode/div.class packages/yasnippet/snippets/html-mode/div.id packages/yasnippet/snippets/html-mode/div.id-class packages/yasnippet/snippets/html-mode/dov packages/yasnippet/snippets/html-mode/form packages/yasnippet/snippets/html-mode/head packages/yasnippet/snippets/html-mode/header/h1 packages/yasnippet/snippets/html-mode/header/h2 packages/yasnippet/snippets/html-mode/header/h3 packages/yasnippet/snippets/html-mode/header/h4 packages/yasnippet/snippets/html-mode/header/h5 packages/yasnippet/snippets/html-mode/header/h6 packages/yasnippet/snippets/html-mode/hr packages/yasnippet/snippets/html-mode/href packages/yasnippet/snippets/html-mode/html packages/yasnippet/snippets/html-mode/html.xmlns packages/yasnippet/snippets/html-mode/i.yasnippet packages/yasnippet/snippets/html-mode/img packages/yasnippet/snippets/html-mode/input packages/yasnippet/snippets/html-mode/link.stylesheet packages/yasnippet/snippets/html-mode/link.stylesheet-ie packages/yasnippet/snippets/html-mode/list/dd packages/yasnippet/snippets/html-mode/list/dl packages/yasnippet/snippets/html-mode/list/dl.id packages/yasnippet/snippets/html-mode/list/dt packages/yasnippet/snippets/html-mode/list/li packages/yasnippet/snippets/html-mode/list/li.class packages/yasnippet/snippets/html-mode/list/ol packages/yasnippet/snippets/html-mode/list/ol.class packages/yasnippet/snippets/html-mode/list/ol.id packages/yasnippet/snippets/html-mode/list/ul packages/yasnippet/snippets/html-mode/list/ul.class packages/yasnippet/snippets/html-mode/list/ul.id packages/yasnippet/snippets/html-mode/mailto packages/yasnippet/snippets/html-mode/meta/doctype packages/yasnippet/snippets/html-mode/meta/doctype.xhml1 packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_1 packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_strict packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_transitional packages/yasnippet/snippets/html-mode/meta/meta packages/yasnippet/snippets/html-mode/meta/meta.http-equiv packages/yasnippet/snippets/html-mode/p packages/yasnippet/snippets/html-mode/pre packages/yasnippet/snippets/html-mode/q.yasnippet packages/yasnippet/snippets/html-mode/quote packages/yasnippet/snippets/html-mode/script.javascript packages/yasnippet/snippets/html-mode/script.javascript-src packages/yasnippet/snippets/html-mode/span packages/yasnippet/snippets/html-mode/span.class packages/yasnippet/snippets/html-mode/span.id packages/yasnippet/snippets/html-mode/style packages/yasnippet/snippets/html-mode/table/table packages/yasnippet/snippets/html-mode/table/td packages/yasnippet/snippets/html-mode/table/th packages/yasnippet/snippets/html-mode/table/tr packages/yasnippet/snippets/html-mode/textarea packages/yasnippet/snippets/html-mode/title packages/yasnippet/snippets/js-mode/assert.yasnippet packages/yasnippet/snippets/js-mode/cb.yasnippet packages/yasnippet/snippets/js-mode/com.yasnippet packages/yasnippet/snippets/js-mode/describe.yasnippet packages/yasnippet/snippets/js-mode/err.snippet packages/yasnippet/snippets/js-mode/error.snippet packages/yasnippet/snippets/js-mode/expect.yasnippet packages/yasnippet/snippets/js-mode/exports.yasnippet packages/yasnippet/snippets/js-mode/fn.yasnippet packages/yasnippet/snippets/js-mode/for.yasnippet packages/yasnippet/snippets/js-mode/id.yasnippet packages/yasnippet/snippets/js-mode/if.yasnippet packages/yasnippet/snippets/js-mode/invoc.yasnippet packages/yasnippet/snippets/js-mode/it.yasnippet packages/yasnippet/snippets/js-mode/log.yasnippet packages/yasnippet/snippets/js-mode/method.yasnippet packages/yasnippet/snippets/js-mode/mod.yasnippet packages/yasnippet/snippets/js-mode/prop.yasnippet packages/yasnippet/snippets/js-mode/proto.yasnippet packages/yasnippet/snippets/js-mode/rq.yasnippet packages/yasnippet/snippets/js-mode/rt.yasnippet packages/yasnippet/snippets/js-mode/slice.yasnippet packages/yasnippet/snippets/js-mode/super.yasnippet packages/yasnippet/snippets/js-mode/switch.yasnippet packages/yasnippet/snippets/js-mode/throw.yasnippet packages/yasnippet/snippets/js-mode/try.yasnippet packages/yasnippet/snippets/js-mode/var.yasnippet packages/yasnippet/snippets/js-mode/wh.yasnippet packages/yasnippet/snippets/js-mode/while.yasnippet packages/yasnippet/snippets/latex-mode/.yas-parents packages/yasnippet/snippets/latex-mode/begin packages/yasnippet/snippets/markdown-mode/+ packages/yasnippet/snippets/markdown-mode/- packages/yasnippet/snippets/markdown-mode/.yas-parents packages/yasnippet/snippets/markdown-mode/_ packages/yasnippet/snippets/markdown-mode/__ packages/yasnippet/snippets/markdown-mode/` packages/yasnippet/snippets/markdown-mode/h1.1 packages/yasnippet/snippets/markdown-mode/h1.2 packages/yasnippet/snippets/markdown-mode/h2.1 packages/yasnippet/snippets/markdown-mode/h2.2 packages/yasnippet/snippets/markdown-mode/h3 packages/yasnippet/snippets/markdown-mode/h4 packages/yasnippet/snippets/markdown-mode/h5 packages/yasnippet/snippets/markdown-mode/h6 packages/yasnippet/snippets/markdown-mode/hr.1 packages/yasnippet/snippets/markdown-mode/hr.2 packages/yasnippet/snippets/markdown-mode/img packages/yasnippet/snippets/markdown-mode/link packages/yasnippet/snippets/markdown-mode/ol packages/yasnippet/snippets/markdown-mode/rimg packages/yasnippet/snippets/markdown-mode/rlb packages/yasnippet/snippets/markdown-mode/rlink packages/yasnippet/snippets/nxml-mode/.yas-parents packages/yasnippet/snippets/nxml-mode/body packages/yasnippet/snippets/nxml-mode/br packages/yasnippet/snippets/nxml-mode/code packages/yasnippet/snippets/nxml-mode/div packages/yasnippet/snippets/nxml-mode/form packages/yasnippet/snippets/nxml-mode/head packages/yasnippet/snippets/nxml-mode/header/h1 packages/yasnippet/snippets/nxml-mode/header/h2 packages/yasnippet/snippets/nxml-mode/header/h3 packages/yasnippet/snippets/nxml-mode/header/h4 packages/yasnippet/snippets/nxml-mode/header/h5 packages/yasnippet/snippets/nxml-mode/header/h6 packages/yasnippet/snippets/nxml-mode/hr packages/yasnippet/snippets/nxml-mode/href packages/yasnippet/snippets/nxml-mode/html packages/yasnippet/snippets/nxml-mode/img packages/yasnippet/snippets/nxml-mode/input packages/yasnippet/snippets/nxml-mode/li packages/yasnippet/snippets/nxml-mode/link packages/yasnippet/snippets/nxml-mode/meta/doctype packages/yasnippet/snippets/nxml-mode/meta/doctype.xhtml1_strict packages/yasnippet/snippets/nxml-mode/meta/doctype.xhtml1_transitional packages/yasnippet/snippets/nxml-mode/meta/meta packages/yasnippet/snippets/nxml-mode/name packages/yasnippet/snippets/nxml-mode/ol packages/yasnippet/snippets/nxml-mode/p packages/yasnippet/snippets/nxml-mode/pre packages/yasnippet/snippets/nxml-mode/quote packages/yasnippet/snippets/nxml-mode/span packages/yasnippet/snippets/nxml-mode/style packages/yasnippet/snippets/nxml-mode/table packages/yasnippet/snippets/nxml-mode/tag.1l packages/yasnippet/snippets/nxml-mode/tag.2l packages/yasnippet/snippets/nxml-mode/td packages/yasnippet/snippets/nxml-mode/th packages/yasnippet/snippets/nxml-mode/title packages/yasnippet/snippets/nxml-mode/tr packages/yasnippet/snippets/nxml-mode/ul packages/yasnippet/snippets/objc-mode/.yas-parents packages/yasnippet/snippets/objc-mode/prop packages/yasnippet/snippets/perl-mode/.yas-parents packages/yasnippet/snippets/perl-mode/eval packages/yasnippet/snippets/perl-mode/for packages/yasnippet/snippets/perl-mode/fore packages/yasnippet/snippets/perl-mode/if packages/yasnippet/snippets/perl-mode/ife packages/yasnippet/snippets/perl-mode/ifee packages/yasnippet/snippets/perl-mode/sub packages/yasnippet/snippets/perl-mode/unless packages/yasnippet/snippets/perl-mode/while packages/yasnippet/snippets/perl-mode/xfore packages/yasnippet/snippets/perl-mode/xif packages/yasnippet/snippets/perl-mode/xunless packages/yasnippet/snippets/perl-mode/xwhile packages/yasnippet/snippets/python-mode/.yas-parents packages/yasnippet/snippets/python-mode/__ packages/yasnippet/snippets/python-mode/class packages/yasnippet/snippets/python-mode/def packages/yasnippet/snippets/python-mode/defm packages/yasnippet/snippets/python-mode/for packages/yasnippet/snippets/python-mode/ifmain packages/yasnippet/snippets/python-mode/prop packages/yasnippet/snippets/python-mode/propg packages/yasnippet/snippets/python-mode/propsg packages/yasnippet/snippets/python-mode/while packages/yasnippet/snippets/rst-mode/.yas-parents packages/yasnippet/snippets/rst-mode/chap packages/yasnippet/snippets/rst-mode/sec packages/yasnippet/snippets/rst-mode/tit packages/yasnippet/snippets/ruby-mode/.yas-parents packages/yasnippet/snippets/ruby-mode/collections/all packages/yasnippet/snippets/ruby-mode/collections/any packages/yasnippet/snippets/ruby-mode/collections/classify packages/yasnippet/snippets/ruby-mode/collections/collect packages/yasnippet/snippets/ruby-mode/collections/deli packages/yasnippet/snippets/ruby-mode/collections/det packages/yasnippet/snippets/ruby-mode/collections/ea packages/yasnippet/snippets/ruby-mode/collections/eac packages/yasnippet/snippets/ruby-mode/collections/eai packages/yasnippet/snippets/ruby-mode/collections/eav packages/yasnippet/snippets/ruby-mode/collections/eawi packages/yasnippet/snippets/ruby-mode/collections/inject packages/yasnippet/snippets/ruby-mode/collections/reject packages/yasnippet/snippets/ruby-mode/collections/select packages/yasnippet/snippets/ruby-mode/collections/zip packages/yasnippet/snippets/ruby-mode/control structure/forin packages/yasnippet/snippets/ruby-mode/control structure/if packages/yasnippet/snippets/ruby-mode/control structure/ife packages/yasnippet/snippets/ruby-mode/control structure/tim packages/yasnippet/snippets/ruby-mode/control structure/until packages/yasnippet/snippets/ruby-mode/control structure/upt packages/yasnippet/snippets/ruby-mode/control structure/when packages/yasnippet/snippets/ruby-mode/control structure/while packages/yasnippet/snippets/ruby-mode/definitions/Comp packages/yasnippet/snippets/ruby-mode/definitions/am packages/yasnippet/snippets/ruby-mode/definitions/cla packages/yasnippet/snippets/ruby-mode/definitions/cls packages/yasnippet/snippets/ruby-mode/definitions/mm packages/yasnippet/snippets/ruby-mode/definitions/mod packages/yasnippet/snippets/ruby-mode/definitions/r packages/yasnippet/snippets/ruby-mode/definitions/rw packages/yasnippet/snippets/ruby-mode/definitions/w packages/yasnippet/snippets/ruby-mode/general/# packages/yasnippet/snippets/ruby-mode/general/=b packages/yasnippet/snippets/ruby-mode/general/app packages/yasnippet/snippets/ruby-mode/general/bm packages/yasnippet/snippets/ruby-mode/general/case packages/yasnippet/snippets/ruby-mode/general/dee packages/yasnippet/snippets/ruby-mode/general/rb packages/yasnippet/snippets/ruby-mode/general/req packages/yasnippet/snippets/ruby-mode/general/rreq packages/yasnippet/snippets/ruby-mode/general/y packages/yasnippet/snippets/scala-mode/.yas-parents packages/yasnippet/snippets/scala-mode/act packages/yasnippet/snippets/scala-mode/act.arg packages/yasnippet/snippets/scala-mode/actor packages/yasnippet/snippets/scala-mode/ano packages/yasnippet/snippets/scala-mode/app packages/yasnippet/snippets/scala-mode/arr.new packages/yasnippet/snippets/scala-mode/arr.val-new packages/yasnippet/snippets/scala-mode/asof packages/yasnippet/snippets/scala-mode/ass packages/yasnippet/snippets/scala-mode/ass.true packages/yasnippet/snippets/scala-mode/at.author packages/yasnippet/snippets/scala-mode/at.param packages/yasnippet/snippets/scala-mode/at.return packages/yasnippet/snippets/scala-mode/at.version packages/yasnippet/snippets/scala-mode/bang packages/yasnippet/snippets/scala-mode/case packages/yasnippet/snippets/scala-mode/case.match-all packages/yasnippet/snippets/scala-mode/cast packages/yasnippet/snippets/scala-mode/cc packages/yasnippet/snippets/scala-mode/cl packages/yasnippet/snippets/scala-mode/cl.abs packages/yasnippet/snippets/scala-mode/cl.abs-arg packages/yasnippet/snippets/scala-mode/cl.arg packages/yasnippet/snippets/scala-mode/clof packages/yasnippet/snippets/scala-mode/co packages/yasnippet/snippets/scala-mode/cons packages/yasnippet/snippets/scala-mode/cons.nil packages/yasnippet/snippets/scala-mode/def.arg packages/yasnippet/snippets/scala-mode/def.arg-body packages/yasnippet/snippets/scala-mode/def.arg-ret packages/yasnippet/snippets/scala-mode/def.arg-ret-body packages/yasnippet/snippets/scala-mode/def.body packages/yasnippet/snippets/scala-mode/def.ret packages/yasnippet/snippets/scala-mode/def.ret-body packages/yasnippet/snippets/scala-mode/def.simple packages/yasnippet/snippets/scala-mode/doc.class packages/yasnippet/snippets/scala-mode/doc.def packages/yasnippet/snippets/scala-mode/doc.file packages/yasnippet/snippets/scala-mode/doc.file-scala packages/yasnippet/snippets/scala-mode/doc.file-scala-api packages/yasnippet/snippets/scala-mode/doc.scaladoc packages/yasnippet/snippets/scala-mode/expect packages/yasnippet/snippets/scala-mode/ext packages/yasnippet/snippets/scala-mode/for.extract packages/yasnippet/snippets/scala-mode/for.if packages/yasnippet/snippets/scala-mode/for.loop packages/yasnippet/snippets/scala-mode/for.multi packages/yasnippet/snippets/scala-mode/foreach packages/yasnippet/snippets/scala-mode/hmap.new packages/yasnippet/snippets/scala-mode/hmap.val-new packages/yasnippet/snippets/scala-mode/hset.new packages/yasnippet/snippets/scala-mode/hset.val-new packages/yasnippet/snippets/scala-mode/if packages/yasnippet/snippets/scala-mode/if.else packages/yasnippet/snippets/scala-mode/imp packages/yasnippet/snippets/scala-mode/intercept packages/yasnippet/snippets/scala-mode/isof packages/yasnippet/snippets/scala-mode/ls.new packages/yasnippet/snippets/scala-mode/ls.val-new packages/yasnippet/snippets/scala-mode/main packages/yasnippet/snippets/scala-mode/map packages/yasnippet/snippets/scala-mode/map.new packages/yasnippet/snippets/scala-mode/match packages/yasnippet/snippets/scala-mode/match.can packages/yasnippet/snippets/scala-mode/match.option packages/yasnippet/snippets/scala-mode/mix packages/yasnippet/snippets/scala-mode/ob packages/yasnippet/snippets/scala-mode/pac packages/yasnippet/snippets/scala-mode/pr.newline packages/yasnippet/snippets/scala-mode/pr.simple packages/yasnippet/snippets/scala-mode/pr.string packages/yasnippet/snippets/scala-mode/pr.trace packages/yasnippet/snippets/scala-mode/pri packages/yasnippet/snippets/scala-mode/pri.param packages/yasnippet/snippets/scala-mode/pro packages/yasnippet/snippets/scala-mode/pro.param packages/yasnippet/snippets/scala-mode/suite packages/yasnippet/snippets/scala-mode/test packages/yasnippet/snippets/scala-mode/throw packages/yasnippet/snippets/scala-mode/tr packages/yasnippet/snippets/scala-mode/tr.ext packages/yasnippet/snippets/scala-mode/tr.ext-with packages/yasnippet/snippets/scala-mode/tr.with packages/yasnippet/snippets/scala-mode/try packages/yasnippet/snippets/scala-mode/try.catch-finally packages/yasnippet/snippets/scala-mode/try.finally packages/yasnippet/snippets/scala-mode/tup.arrow packages/yasnippet/snippets/scala-mode/tup.paren packages/yasnippet/snippets/scala-mode/val packages/yasnippet/snippets/scala-mode/val.new packages/yasnippet/snippets/scala-mode/val.ret packages/yasnippet/snippets/scala-mode/var packages/yasnippet/snippets/scala-mode/var.new packages/yasnippet/snippets/scala-mode/var.ret packages/yasnippet/snippets/scala-mode/whi packages/yasnippet/snippets/scala-mode/with packages/yasnippet/snippets/snippet-mode/.yas-parents packages/yasnippet/snippets/snippet-mode/field packages/yasnippet/snippets/snippet-mode/mirror packages/yasnippet/snippets/snippet-mode/vars packages/yasnippet/snippets/sql-mode/.yas-parents packages/yasnippet/snippets/sql-mode/column packages/yasnippet/snippets/sql-mode/constraint packages/yasnippet/snippets/sql-mode/constraint.1 packages/yasnippet/snippets/sql-mode/create packages/yasnippet/snippets/sql-mode/create.1 packages/yasnippet/snippets/sql-mode/references packages/yasnippet/snippets/text-mode/email packages/yasnippet/snippets/text-mode/time packages/yasnippet/yasnippet-tests.el --- 39a27b6cd6ced60e81145efb18d72d6081eac9f7 diff --cc packages/yasnippet/.travis.yml index 000000000,4bd79405d..4bd79405d mode 000000,100644..100644 --- a/packages/yasnippet/.travis.yml +++ b/packages/yasnippet/.travis.yml diff --cc packages/yasnippet/CONTRIBUTING.md index 000000000,83310bc70..83310bc70 mode 000000,100644..100644 --- a/packages/yasnippet/CONTRIBUTING.md +++ b/packages/yasnippet/CONTRIBUTING.md diff --cc packages/yasnippet/doc/doc/.nosearch index e69de29bb,000000000..e69de29bb mode 100644,000000..100644 --- a/packages/yasnippet/doc/doc/.nosearch +++ b/packages/yasnippet/doc/doc/.nosearch diff --cc packages/yasnippet/doc/doc/faq.org index 000000000,79249e86f..79249e86f mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/faq.org +++ b/packages/yasnippet/doc/doc/faq.org diff --cc packages/yasnippet/doc/doc/index.org index 000000000,f99b3f7f5..f99b3f7f5 mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/index.org +++ b/packages/yasnippet/doc/doc/index.org diff --cc packages/yasnippet/doc/doc/nav-menu.html.inc index 000000000,b31ec940e..b31ec940e mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/nav-menu.html.inc +++ b/packages/yasnippet/doc/doc/nav-menu.html.inc diff --cc packages/yasnippet/doc/doc/org-setup.inc index 000000000,6ad09c933..6ad09c933 mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/org-setup.inc +++ b/packages/yasnippet/doc/doc/org-setup.inc diff --cc packages/yasnippet/doc/doc/snippet-development.org index 000000000,9e8f9010a..9e8f9010a mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/snippet-development.org +++ b/packages/yasnippet/doc/doc/snippet-development.org diff --cc packages/yasnippet/doc/doc/snippet-expansion.org index 000000000,876b81c3e..876b81c3e mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/snippet-expansion.org +++ b/packages/yasnippet/doc/doc/snippet-expansion.org diff --cc packages/yasnippet/doc/doc/snippet-menu.org index 000000000,46b9b0c0c..46b9b0c0c mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/snippet-menu.org +++ b/packages/yasnippet/doc/doc/snippet-menu.org diff --cc packages/yasnippet/doc/doc/snippet-organization.org index 000000000,ee55a8efb..ee55a8efb mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/snippet-organization.org +++ b/packages/yasnippet/doc/doc/snippet-organization.org diff --cc packages/yasnippet/doc/doc/snippet-reference.org index 000000000,a38fca5a9..a38fca5a9 mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/snippet-reference.org +++ b/packages/yasnippet/doc/doc/snippet-reference.org diff --cc packages/yasnippet/doc/doc/stylesheets/manual.css index 000000000,f2677c5a4..f2677c5a4 mode 000000,100644..100644 --- a/packages/yasnippet/doc/doc/stylesheets/manual.css +++ b/packages/yasnippet/doc/doc/stylesheets/manual.css diff --cc packages/yasnippet/yasnippet-tests.el index 9bf592f88,0f113522d..e64c44ba8 --- a/packages/yasnippet/yasnippet-tests.el +++ b/packages/yasnippet/yasnippet-tests.el @@@ -645,5 -820,22 +821,21 @@@ add the snippets associated with the gi ;;; /usr/bin/emacs -nw -Q -L . -l yasnippet-tests.el --batch -e ert + (put 'yas-saving-variables 'edebug-form-spec t) + (put 'yas-with-snippet-dirs 'edebug-form-spec t) + (put 'yas-with-overriden-buffer-list 'edebug-form-spec t) + (put 'yas-with-some-interesting-snippet-dirs 'edebug-form-spec t) + + + (put 'yas--with-temporary-redefinitions 'lisp-indent-function 1) + (put 'yas--with-temporary-redefinitions 'edebug-form-spec '((&rest (defun*)) cl-declarations body)) + + + + (provide 'yasnippet-tests) + ;; Local Variables: + ;; indent-tabs-mode: nil -;; lexical-binding: t + ;; byte-compile-warnings: (not cl-functions) + ;; End: ;;; yasnippet-tests.el ends here