Sync with yasnippet/master

diff --cc packages/yasnippet/.gitignore
index 6c1548895360ce716290b1adb9d314d431860535,0000000000000000000000000000000000000000..c433a5795f3be14415dd058638895c0c211c32db
mode 100644,000000..100644
--- 1/packages/yasnippet/.gitignore
--- /dev/null
+++ b/packages/yasnippet/.gitignore
@@@ -1,8 -1,0 +1,10 @@@
 +authors.txt\r
 +doc/gh-pages\r
 +doc/*.html\r
 +pkg/\r
 +extras/imported/**\r
 +!extras/imported/*/.yas-setup.el\r
 +.yas-compiled-snippets.el\r
 +*.elc\r
++ert-x.*\r
++ert.*\r

diff --cc packages/yasnippet/README.mdown
Simple merge

diff --cc packages/yasnippet/Rakefile
Simple merge

diff --cc packages/yasnippet/doc/manual.mdown
index 0000000000000000000000000000000000000000,aac0d89d8530644f6bb41338f22a4e79d0ff2480..aac0d89d8530644f6bb41338f22a4e79d0ff2480
mode 000000,100644..100644
--- /dev/null
--- 2/doc/manual.mdown
+++ b/packages/yasnippet/doc/manual.mdown

diff --cc packages/yasnippet/doc/yas-doc-helper.el
index 0000000000000000000000000000000000000000,3217834ef0f07564dfcc044f25dc9b0766534b00..3217834ef0f07564dfcc044f25dc9b0766534b00
mode 000000,100755..100755
--- /dev/null
--- 2/doc/yas-doc-helper.el
+++ b/packages/yasnippet/doc/yas-doc-helper.el

diff --cc packages/yasnippet/extras/imported/html-mode/.yas-setup.el
Simple merge

diff --cc packages/yasnippet/snippets/c++-mode/ns
Simple merge

diff --cc packages/yasnippet/snippets/c++-mode/using
Simple merge

diff --cc packages/yasnippet/snippets/c-mode/printf
Simple merge

diff --cc packages/yasnippet/snippets/csharp-mode/class
Simple merge

diff --cc packages/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
index 710657c0ea6e3be50ecd042f460a8a7c87efb948,77ca69d7fc5a70ef7c5e92e72e9af72faf050af1..77ca69d7fc5a70ef7c5e92e72e9af72faf050af1
mode 100644,100755..100644
--- 1/packages/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
--- 2/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
+++ b/packages/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet

diff --cc packages/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
index f85fe4e2a66c644c4e35ace46361e40c78f61de8,e4cb092ca974799b4ccb6420dde5d840de4ffd3f..e4cb092ca974799b4ccb6420dde5d840de4ffd3f
mode 100644,100755..100644
--- 1/packages/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
--- 2/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
+++ b/packages/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet

diff --cc packages/yasnippet/snippets/emacs-lisp-mode/x-find-replace.yasnippet
index e5a1d6c39f833de24ce5af12b14e74a2d5f998d3,b0c58ec214929ffaf1872ef03ccd48f88fc0212f..b0c58ec214929ffaf1872ef03ccd48f88fc0212f
mode 100644,100755..100644
--- 1/packages/yasnippet/snippets/emacs-lisp-mode/x-find-replace.yasnippet
--- 2/snippets/emacs-lisp-mode/x-find-replace.yasnippet
+++ b/packages/yasnippet/snippets/emacs-lisp-mode/x-find-replace.yasnippet

diff --cc packages/yasnippet/snippets/f90-mode/au
Simple merge

diff --cc packages/yasnippet/snippets/f90-mode/ii
Simple merge

diff --cc packages/yasnippet/snippets/html-mode/div
Simple merge

diff --cc packages/yasnippet/snippets/html-mode/script.javascript
Simple merge

diff --cc packages/yasnippet/snippets/html-mode/script.javascript-src
Simple merge

diff --cc packages/yasnippet/snippets/js-mode/assert.yasnippet
index 0000000000000000000000000000000000000000,59ec61490aa8b4e7924e4bc212f4fe8bacfabe0c..59ec61490aa8b4e7924e4bc212f4fe8bacfabe0c
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/assert.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/assert.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/cb.yasnippet
index 0000000000000000000000000000000000000000,9453e6adc91631f0a78d65ca283657da875d2add..9453e6adc91631f0a78d65ca283657da875d2add
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/cb.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/cb.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/com.yasnippet
index 0000000000000000000000000000000000000000,1eff9fe7e2995cd354861dcc550d9b0ce53b7273..1eff9fe7e2995cd354861dcc550d9b0ce53b7273
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/com.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/com.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/describe.yasnippet
index 0000000000000000000000000000000000000000,c40bae779c71b0cb9b3ff73d8c2374206e8594ac..c40bae779c71b0cb9b3ff73d8c2374206e8594ac
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/describe.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/describe.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/err.snippet
index 0000000000000000000000000000000000000000,a4b713bb20ac80c256f577cadc4bce1495f5535e..a4b713bb20ac80c256f577cadc4bce1495f5535e
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/err.snippet
+++ b/packages/yasnippet/snippets/js-mode/err.snippet

diff --cc packages/yasnippet/snippets/js-mode/error.snippet
index 0000000000000000000000000000000000000000,1c99ad206d7d75be874efed70e81d59029bb5acf..1c99ad206d7d75be874efed70e81d59029bb5acf
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/error.snippet
+++ b/packages/yasnippet/snippets/js-mode/error.snippet

diff --cc packages/yasnippet/snippets/js-mode/expect.yasnippet
index 0000000000000000000000000000000000000000,8e0879e930274ba106a8d7b5844169e4ff18af2e..8e0879e930274ba106a8d7b5844169e4ff18af2e
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/expect.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/expect.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/exports.yasnippet
index 0000000000000000000000000000000000000000,6e183cd951af9c2584bb8a48ccb59ca0d449b506..6e183cd951af9c2584bb8a48ccb59ca0d449b506
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/exports.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/exports.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/fn.yasnippet
index 0000000000000000000000000000000000000000,67294fcc43116bc54042ddfaa7e6367cce2cd4d8..67294fcc43116bc54042ddfaa7e6367cce2cd4d8
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/fn.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/fn.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/for.yasnippet
index 0000000000000000000000000000000000000000,97d772f98f7c5473f7fe8a057e3c32dccab43a46..97d772f98f7c5473f7fe8a057e3c32dccab43a46
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/for.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/for.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/id.yasnippet
index 0000000000000000000000000000000000000000,47f00b9b3a33b2ea5b0db542819eb6023c35d0f6..47f00b9b3a33b2ea5b0db542819eb6023c35d0f6
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/id.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/id.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/if.yasnippet
index 0000000000000000000000000000000000000000,0fac8556af355f02c5390875d72b40721fada11e..0fac8556af355f02c5390875d72b40721fada11e
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/if.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/if.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/invoc.yasnippet
index 0000000000000000000000000000000000000000,cf46321cdb1cb3ead9c285ebdd6c50f76e66faf4..cf46321cdb1cb3ead9c285ebdd6c50f76e66faf4
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/invoc.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/invoc.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/it.yasnippet
index 0000000000000000000000000000000000000000,161d51f18e9e3f458c6a6b11e192278240075a8f..161d51f18e9e3f458c6a6b11e192278240075a8f
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/it.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/it.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/log.yasnippet
index 0000000000000000000000000000000000000000,19ff1be91bf3742dc829d93d76d579557458d087..19ff1be91bf3742dc829d93d76d579557458d087
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/log.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/log.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/method.yasnippet
index 0000000000000000000000000000000000000000,67fb56ad817eefa320ce22a1208365fcc295520e..67fb56ad817eefa320ce22a1208365fcc295520e
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/method.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/method.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/mod.yasnippet
index 0000000000000000000000000000000000000000,c1b9867d0a65b04c51a1a7b6c93032470c9cb331..c1b9867d0a65b04c51a1a7b6c93032470c9cb331
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/mod.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/mod.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/prop.yasnippet
index 0000000000000000000000000000000000000000,dc234c77a5904676457585a0c7d8f519d35aac87..dc234c77a5904676457585a0c7d8f519d35aac87
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/prop.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/prop.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/proto.yasnippet
index 0000000000000000000000000000000000000000,c6fe215831085e837fff3708bcb6a3a35c26f70b..c6fe215831085e837fff3708bcb6a3a35c26f70b
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/proto.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/proto.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/rq.yasnippet
index 0000000000000000000000000000000000000000,864534d09e9e7661f31050c95cc271b27a37aae0..864534d09e9e7661f31050c95cc271b27a37aae0
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/rq.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/rq.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/rt.yasnippet
index 0000000000000000000000000000000000000000,d9a5bdf10432549c81967febc92256160f701a4d..d9a5bdf10432549c81967febc92256160f701a4d
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/rt.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/rt.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/slice.yasnippet
index 0000000000000000000000000000000000000000,2dd65be2a6af5257e13ebc2c442c8dad6da04362..2dd65be2a6af5257e13ebc2c442c8dad6da04362
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/slice.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/slice.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/super.yasnippet
index 0000000000000000000000000000000000000000,4638026c3262fa69cbc2f4f66c7f873246977df0..4638026c3262fa69cbc2f4f66c7f873246977df0
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/super.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/super.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/switch.yasnippet
index 0000000000000000000000000000000000000000,5e4fc3fd11563ef688970025f040c1df1bc2d4e3..5e4fc3fd11563ef688970025f040c1df1bc2d4e3
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/switch.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/switch.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/throw.yasnippet
index 0000000000000000000000000000000000000000,dbef383001d796abdb0dda2266c1e57d6fff0fdd..dbef383001d796abdb0dda2266c1e57d6fff0fdd
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/throw.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/throw.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/try.yasnippet
index 0000000000000000000000000000000000000000,903378fd24fce6188f4d1cc20f71d89b44bdf0b7..903378fd24fce6188f4d1cc20f71d89b44bdf0b7
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/try.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/try.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/var.yasnippet
index 0000000000000000000000000000000000000000,77d52a5a8c13f6a0abbfbf8097a7e4be6baf9167..77d52a5a8c13f6a0abbfbf8097a7e4be6baf9167
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/var.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/var.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/wh.yasnippet
index 0000000000000000000000000000000000000000,f733ac4073858476198c3040603b50aa6973acdd..f733ac4073858476198c3040603b50aa6973acdd
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/wh.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/wh.yasnippet

diff --cc packages/yasnippet/snippets/js-mode/while.yasnippet
index 0000000000000000000000000000000000000000,9eff9dfac445817f696b8d494a4eb2a7c62525a4..9eff9dfac445817f696b8d494a4eb2a7c62525a4
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/js-mode/while.yasnippet
+++ b/packages/yasnippet/snippets/js-mode/while.yasnippet

diff --cc packages/yasnippet/snippets/python-mode/def
Simple merge

diff --cc packages/yasnippet/snippets/ruby-mode/collections/zip
Simple merge

diff --cc packages/yasnippet/snippets/ruby-mode/definitions/mod
index 0000000000000000000000000000000000000000,118400c37e5a1b36aae31fb50f85090cb64edb2a..118400c37e5a1b36aae31fb50f85090cb64edb2a
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/ruby-mode/definitions/mod
+++ b/packages/yasnippet/snippets/ruby-mode/definitions/mod

diff --cc packages/yasnippet/snippets/ruby-mode/general/#
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/asof
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/case
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/case.match-all
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/cast
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/clof
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/doc.class
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/doc.def
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/doc.file
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/doc.file-scala
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/doc.file-scala-api
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/isof
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/match.can
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/match.option
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/try
Simple merge

diff --cc packages/yasnippet/snippets/scala-mode/try.catch-finally
Simple merge

diff --cc packages/yasnippet/snippets/sql-mode/constraint
Simple merge

diff --cc packages/yasnippet/snippets/sql-mode/constraint.1
Simple merge

diff --cc packages/yasnippet/snippets/sql-mode/create
Simple merge

diff --cc packages/yasnippet/snippets/sql-mode/create.1
Simple merge

diff --cc packages/yasnippet/yasnippet-tests.el
Simple merge

diff --cc packages/yasnippet/yasnippet.el
Simple merge