Merge branch 'master' of github.com:capitaomorte/yasnippet

2025-10-14 13:33:04 +00:00 · 2011-11-04 14:33:24 +00:00 · 2011-11-04 14:33:24 +00:00 · 0fe12bf6d4
commit 0fe12bf6d4
parent 1ff52c8e0e 36467fa0d1
533 changed files with 1263 additions and 1262 deletions
--- a/snippets/erlang-mode/if
+++ b/snippets/erlang-mode/if
@ -1,5 +1,5 @@
 # name: if ... -> ... ; true -> ... end
-# key: erlang-modeif
+# key: if
 # --
 if
    $1 -> $2;
--- a/snippets/erlang-mode/ifdef
+++ b/snippets/erlang-mode/ifdef
@ -1,5 +1,5 @@
 # name: -ifdef(...). ... -endif.
-# key: erlang-modeifdef
+# key: ifdef
 # --
 -ifdef($1).
 $0
--- a/snippets/erlang-mode/ifndef
+++ b/snippets/erlang-mode/ifndef
@ -1,5 +1,5 @@
 # name: -ifndef(...). ... -endif.
-# key: erlang-modeifndef
+# key: ifndef
 # --
 -ifndef($1).
 $0
--- a/snippets/f90-mode/if
+++ b/snippets/f90-mode/if
@ -1,6 +1,6 @@
 # contributor: Li Zhu <http://www.zhuli.name>
 # name: if then end if
-# key: f90-modeif
+# key: if
 # --
 if ( ${1:condition} ) then
   $0
--- a/snippets/html-mode/header/h1
+++ b/snippets/html-mode/header/h1
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <h1>...</h1>
-# key: headerh1
+# key: h1
 # --
 <h1>$1</h1>
--- a/snippets/html-mode/header/h2
+++ b/snippets/html-mode/header/h2
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <h2>...</h2>
-# key: headerh2
+# key: h2
 # --
 <h2>$1</h2>
--- a/snippets/html-mode/header/h3
+++ b/snippets/html-mode/header/h3
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <h3>...</h3>
-# key: headerh3
+# key: h3
 # --
 <h3>$1</h3>
--- a/snippets/html-mode/header/h4
+++ b/snippets/html-mode/header/h4
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <h4>...</h4>
-# key: headerh4
+# key: h4
 # --
 <h4>$1</h4>
--- a/snippets/html-mode/header/h5
+++ b/snippets/html-mode/header/h5
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <h5>...</h5>
-# key: headerh5
+# key: h5
 # --
 <h5>$1</h5>
--- a/snippets/html-mode/header/h6
+++ b/snippets/html-mode/header/h6
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <h6>...</h6>
-# key: headerh6
+# key: h6
 # --
 <h6>$1</h6>
--- a/snippets/html-mode/list/dd
+++ b/snippets/html-mode/list/dd
@ -1,5 +1,5 @@
 # contributor: Rodrigo Setti <rodrigosetti@gmail.com>
 # name: <dd> ... </dd>
-# key: listdd
+# key: dd
 # --
 <dd>$1</dd>
--- a/snippets/html-mode/list/dl
+++ b/snippets/html-mode/list/dl
@ -1,6 +1,6 @@
 # contributor: Rodrigo Setti <rodrigosetti@gmail.com>
 # name: <dl> ... </dl>
-# key: listdl
+# key: dl
 # --
 <dl>
    $0
--- a/snippets/html-mode/list/dl.id
+++ b/snippets/html-mode/list/dl.id
@ -1,6 +1,6 @@
 # contributor: Rodrigo Setti <rodrigosetti@gmail.com>
 # name: <dl> ... </dl>
-# key: listdl
+# key: dl
 # --
 <dl id="$1">
    $0
--- a/snippets/html-mode/list/dt
+++ b/snippets/html-mode/list/dt
@ -1,5 +1,5 @@
 # contributor: Rodrigo Setti <rodrigosetti@gmail.com>
 # name: <dt> ... </dt>
-# key: listdt
+# key: dt
 # --
 <dt>$1</dt>
--- a/snippets/html-mode/list/li
+++ b/snippets/html-mode/list/li
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <li>...</li>
-# key: listli
+# key: li
 # --
 <li>$1</li>
--- a/snippets/html-mode/list/li.class
+++ b/snippets/html-mode/list/li.class
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <li class="...">...</li>
-# key: listli
+# key: li
 # --
 <li class="$1">$2</li>
--- a/snippets/html-mode/list/ol
+++ b/snippets/html-mode/list/ol
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <ol>...</ol>
-# key: listol
+# key: ol
 # --
 <ol>
  $0
--- a/snippets/html-mode/list/ol.class
+++ b/snippets/html-mode/list/ol.class
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <ol class="...">...</ol>
-# key: listol
+# key: ol
 # --
 <ol class="$1">
  $0
--- a/snippets/html-mode/list/ol.id
+++ b/snippets/html-mode/list/ol.id
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <ol id="...">...</ol>
-# key: listol
+# key: ol
 # --
 <ol id="$1">
  $0
--- a/snippets/html-mode/list/ul
+++ b/snippets/html-mode/list/ul
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <ul>...</ul>
-# key: listul
+# key: ul
 # --
 <ul>
  $0
--- a/snippets/html-mode/list/ul.class
+++ b/snippets/html-mode/list/ul.class
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <ul class="...">...</ul>
-# key: listul
+# key: ul
 # --
 <ul class="$1">
  $0
--- a/snippets/html-mode/list/ul.id
+++ b/snippets/html-mode/list/ul.id
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <ul id="...">...</ul>
-# key: listul
+# key: ul
 # --
 <ul id="$1">
  $0
--- a/snippets/html-mode/meta/doctype
+++ b/snippets/html-mode/meta/doctype
@ -1,4 +1,4 @@
 # name: Doctype HTML 4.01 Strict
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
--- a/snippets/html-mode/meta/doctype.xhml1
+++ b/snippets/html-mode/meta/doctype.xhml1
@ -1,4 +1,4 @@
 # name: DocType XHTML 1.0 frameset
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
--- a/snippets/html-mode/meta/doctype.xhtml1_1
+++ b/snippets/html-mode/meta/doctype.xhtml1_1
@ -1,4 +1,4 @@
 # name: DocType XHTML 1.1
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
--- a/snippets/html-mode/meta/doctype.xhtml1_strict
+++ b/snippets/html-mode/meta/doctype.xhtml1_strict
@ -1,4 +1,4 @@
 # name: DocType XHTML 1.0 Strict
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
--- a/snippets/html-mode/meta/doctype.xhtml1_transitional
+++ b/snippets/html-mode/meta/doctype.xhtml1_transitional
@ -1,4 +1,4 @@
 # name: DocType XHTML 1.0 Transitional
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- a/snippets/html-mode/meta/meta
+++ b/snippets/html-mode/meta/meta
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <meta name="..." content="..." />
-# key: metameta
+# key: meta
 # --
 <meta name="${1:generator}" content="${2:content}" />
--- a/snippets/html-mode/meta/meta.http-equiv
+++ b/snippets/html-mode/meta/meta.http-equiv
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <meta http-equiv="..." content="..." />
-# key: metameta
+# key: meta
 # --
 <meta http-equiv="${1:Content-Type}" content="${2:text/html; charset=UTF-8}" />
--- a/snippets/html-mode/table/table
+++ b/snippets/html-mode/table/table
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <table ...>...</table>
-# key: tabletable
+# key: table
 # --
 <table width="$1" cellspacing="$2" cellpadding="$3" border="$4">
  $0
--- a/snippets/html-mode/table/td
+++ b/snippets/html-mode/table/td
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <td>...</td>
-# key: tabletd
+# key: td
 # --
 <td$1>$2</td>
--- a/snippets/html-mode/table/th
+++ b/snippets/html-mode/table/th
@ -1,5 +1,5 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <th>...</th>
-# key: tableth
+# key: th
 # --
 <th$1>$2</th>
--- a/snippets/html-mode/table/tr
+++ b/snippets/html-mode/table/tr
@ -1,6 +1,6 @@
 # contributor: Jimmy Wu <frozenthrone88@gmail.com>
 # name: <tr>...</tr>
-# key: tabletr
+# key: tr
 # --
 <tr>
  $0
--- a/snippets/nxml-mode/header/h1
+++ b/snippets/nxml-mode/header/h1
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: <h1>...</h1>
-# key: headerh1
+# key: h1
 # --
 <h1>$1</h1>
--- a/snippets/nxml-mode/header/h2
+++ b/snippets/nxml-mode/header/h2
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: <h2>...</h2>
-# key: headerh2
+# key: h2
 # --
 <h2>$1</h2>
--- a/snippets/nxml-mode/header/h3
+++ b/snippets/nxml-mode/header/h3
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: <h3>...</h3>
-# key: headerh3
+# key: h3
 # --
 <h3>$1</h3>
--- a/snippets/nxml-mode/header/h4
+++ b/snippets/nxml-mode/header/h4
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: <h4>...</h4>
-# key: headerh4
+# key: h4
 # --
 <h4>$1</h4>
--- a/snippets/nxml-mode/header/h5
+++ b/snippets/nxml-mode/header/h5
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: <h5>...</h5>
-# key: headerh5
+# key: h5
 # --
 <h5>$1</h5>
--- a/snippets/nxml-mode/header/h6
+++ b/snippets/nxml-mode/header/h6
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: <h6>...</h6>
-# key: headerh6
+# key: h6
 # --
 <h6>$1</h6>
--- a/snippets/nxml-mode/meta/doctype
+++ b/snippets/nxml-mode/meta/doctype
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: DocType XHTML 1.1
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
--- a/snippets/nxml-mode/meta/doctype.xhtml1_strict
+++ b/snippets/nxml-mode/meta/doctype.xhtml1_strict
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: DocType XHTML 1.0 Strict
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
--- a/snippets/nxml-mode/meta/doctype.xhtml1_transitional
+++ b/snippets/nxml-mode/meta/doctype.xhtml1_transitional
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: DocType XHTML 1.0 Transitional
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- a/snippets/nxml-mode/meta/meta
+++ b/snippets/nxml-mode/meta/meta
@ -1,5 +1,5 @@
 # contributor: Anders Bach Nielsen <abachn@abachn.net>
 # name: <meta name="..." content="..." />
-# key: metameta
+# key: meta
 # --
 <meta name="${1:generator}" content="${2:content}" />
--- a/snippets/perl-mode/if
+++ b/snippets/perl-mode/if
@ -1,5 +1,5 @@
 # name: if (...) { ... }
-# key: perl-modeif
+# key: if
 # --
 if ($1) {
    $0
--- a/snippets/perl-mode/ife
+++ b/snippets/perl-mode/ife
@ -1,5 +1,5 @@
 # name: if (...) { ... } else { ... }
-# key: perl-modeife
+# key: ife
 # --
 if ($1) {
    $2
--- a/snippets/perl-mode/ifee
+++ b/snippets/perl-mode/ifee
@ -1,5 +1,5 @@
 # name: if, elsif, else ...
-# key: perl-modeifee
+# key: ifee
 # --
 if ($1) {
 	${2:# body...}
--- a/snippets/perl-mode/xif
+++ b/snippets/perl-mode/xif
@ -1,4 +1,4 @@
 # name: ... if ...
-# key: perl-modexif
+# key: xif
 # --
 ${1:expression} if ${2:condition}
--- a/snippets/python-mode/ifmain
+++ b/snippets/python-mode/ifmain
@ -1,5 +1,5 @@
 # name: if __name__ == '__main__': ...
-# key: python-modeifmain
+# key: ifmain
 # --
 if __name__ == '__main__':
    $0
--- a/snippets/ruby-mode/collections/all
+++ b/snippets/ruby-mode/collections/all
@ -1,4 +1,4 @@
 # name: all? { |...| ... }
-# key: collectionsall
+# key: all
 # --
 all? { |${e}| $0 }
--- a/snippets/ruby-mode/collections/any
+++ b/snippets/ruby-mode/collections/any
@ -1,4 +1,4 @@
 # name: any? { |...| ... }
-# key: collectionsany
+# key: any
 # --
 any? { |${e}| $0 }
--- a/snippets/ruby-mode/collections/classify
+++ b/snippets/ruby-mode/collections/classify
@ -1,4 +1,4 @@
 # name: classify { |...| ... }
-# key: ruby-modecollectionsclassify
+# key: classify
 # --
 classify { |${e}| $0 }
--- a/snippets/ruby-mode/collections/collect
+++ b/snippets/ruby-mode/collections/collect
@ -1,4 +1,4 @@
 # name: collect { |...| ... }
-# key: collectionscollect
+# key: collect
 # --
 collect { |${e}| $0 }
--- a/snippets/ruby-mode/collections/deli
+++ b/snippets/ruby-mode/collections/deli
@ -1,4 +1,4 @@
 # name: delete_if { |...| ... }
-# key: collectionsdeli
+# key: deli
 # --
 delete_if { |${e} $0 }
--- a/snippets/ruby-mode/collections/det
+++ b/snippets/ruby-mode/collections/det
@ -1,4 +1,4 @@
 # name: detect { |...| ... }
-# key: collectionsdet
+# key: det
 # --
 detect { |${e}| $0 }
--- a/snippets/ruby-mode/collections/ea
+++ b/snippets/ruby-mode/collections/ea
@ -1,4 +1,4 @@
 # name: each { |...| ... }
-# key: collectionsea
+# key: ea
 # --
 each { |${e}| $0 }
--- a/snippets/ruby-mode/collections/eac
+++ b/snippets/ruby-mode/collections/eac
@ -1,4 +1,4 @@
 # name: each_cons(...) { |...| ... }
-# key: collectionseac
+# key: eac
 # --
 each_cons(${1:2}) { |${group}| $0 }
--- a/snippets/ruby-mode/collections/eai
+++ b/snippets/ruby-mode/collections/eai
@ -1,4 +1,4 @@
 # name: each_index { |i| ... }
-# key: collectionseai
+# key: eai
 # --
 each_index { |${i}| $0 }
--- a/snippets/ruby-mode/collections/eav
+++ b/snippets/ruby-mode/collections/eav
@ -1,4 +1,4 @@
 # name: each_value { |val| ... }
-# key: collectionseav
+# key: eav
 # --
 each_value { |${val}| $0 }
--- a/snippets/ruby-mode/collections/eawi
+++ b/snippets/ruby-mode/collections/eawi
@ -1,4 +1,4 @@
 # name: each_with_index { |e, i| ... }
-# key: collectionseawi
+# key: eawi
 # --
 each_with_index { |${e}, ${i}| $0 }
--- a/snippets/ruby-mode/collections/inject
+++ b/snippets/ruby-mode/collections/inject
@ -1,4 +1,4 @@
 # name: inject(...) { |...| ... }
-# key: collectionsinject
+# key: inject
 # --
 inject(${1:0}) { |${2:injection}, ${3:element}| $0 }
--- a/snippets/ruby-mode/collections/reject
+++ b/snippets/ruby-mode/collections/reject
@ -1,4 +1,4 @@
 # name: reject { |...| ... }
-# key: collectionsreject
+# key: reject
 # --
 reject { |${1:element}| $0 }
--- a/snippets/ruby-mode/collections/select
+++ b/snippets/ruby-mode/collections/select
@ -1,4 +1,4 @@
 # name: select { |...| ... }
-# key: collectionsselect
+# key: select
 # --
 select { |${1:element}| $0 }
--- a/snippets/ruby-mode/definitions/Comp
+++ b/snippets/ruby-mode/definitions/Comp
@ -1,5 +1,5 @@
 # name: include Comparable; def <=> ... end
-# key: definitionsComp
+# key: Comp
 # --
 include Comparable
--- a/snippets/ruby-mode/definitions/am
+++ b/snippets/ruby-mode/definitions/am
@ -1,4 +1,4 @@
 # name: alias_method new, old
-# key: definitionsam
+# key: am
 # --
 alias_method :${new_name}, :${old_name}
--- a/snippets/ruby-mode/definitions/cla
+++ b/snippets/ruby-mode/definitions/cla
@ -1,5 +1,5 @@
 # name: class << self ... end
-# key: definitionscla
+# key: cla
 # --
 class << ${self}
  $0
--- a/snippets/ruby-mode/definitions/cls
+++ b/snippets/ruby-mode/definitions/cls
@ -1,6 +1,6 @@
 # name: class ... end
 # contributor: hitesh <hitesh.jasani@gmail.com>
-# key: definitionscls
+# key: cls
 # --
 class ${1:`(let ((fn (capitalize (file-name-nondirectory
                                 (file-name-sans-extension
--- a/snippets/ruby-mode/definitions/mm
+++ b/snippets/ruby-mode/definitions/mm
@ -1,5 +1,5 @@
 # name: def method_missing ... end
-# key: definitionsmm
+# key: mm
 # --
 def method_missing(method, *args)
  $0
--- a/snippets/ruby-mode/definitions/r
+++ b/snippets/ruby-mode/definitions/r
@ -1,4 +1,4 @@
 # name: attr_reader ...
-# key: definitionsr
+# key: r
 # --
 attr_reader :
--- a/snippets/ruby-mode/definitions/rw
+++ b/snippets/ruby-mode/definitions/rw
@ -1,4 +1,4 @@
 # name: attr_accessor ...
-# key: definitionsrw
+# key: rw
 # --
 attr_accessor :
--- a/snippets/ruby-mode/definitions/w
+++ b/snippets/ruby-mode/definitions/w
@ -1,4 +1,4 @@
 # name: attr_writer ...
-# key: definitionsw
+# key: w
 # --
 attr_writer :
--- a/snippets/ruby-mode/general/#
+++ b/snippets/ruby-mode/general/#
@ -1,4 +1,4 @@
 # name: # =>
-# key: general#
+# key: #
 # --
 # => 
--- a/snippets/ruby-mode/general/=b
+++ b/snippets/ruby-mode/general/=b
@ -1,5 +1,5 @@
 # name: =begin rdoc ... =end
-# key: general=b
+# key: =b
 # --
 =begin rdoc
  $0
--- a/snippets/ruby-mode/general/app
+++ b/snippets/ruby-mode/general/app
@ -1,5 +1,5 @@
 # name: if __FILE__ == $PROGRAM_NAME ... end
-# key: generalapp
+# key: app
 # --
 if __FILE__ == $PROGRAM_NAME
  $0
--- a/snippets/ruby-mode/general/bm
+++ b/snippets/ruby-mode/general/bm
@ -1,5 +1,5 @@
 # name: Benchmark.bmbm(...) do ... end
-# key: generalbm
+# key: bm
 # --
 Benchmark.bmbm(${1:10}) do |x|
  $0
--- a/snippets/ruby-mode/general/case
+++ b/snippets/ruby-mode/general/case
@ -1,5 +1,5 @@
 # name: case ... end
-# key: generalcase
+# key: case
 # --
 case ${1:object}
 when ${2:condition}
--- a/snippets/ruby-mode/general/dee
+++ b/snippets/ruby-mode/general/dee
@ -1,4 +1,4 @@
 # name: deep_copy(...)
-# key: generaldee
+# key: dee
 # --
 Marshal.load(Marshal.dump($0))
--- a/snippets/ruby-mode/general/rb
+++ b/snippets/ruby-mode/general/rb
@ -1,4 +1,4 @@
 # name: /usr/bin/ruby -wKU
-# key: generalrb
+# key: rb
 # --
 #!/usr/bin/ruby -wKU
--- a/snippets/ruby-mode/general/req
+++ b/snippets/ruby-mode/general/req
@ -1,4 +1,4 @@
 # name: require "..."
-# key: generalreq
+# key: req
 # --
 require "$0"
--- a/snippets/ruby-mode/general/rreq
+++ b/snippets/ruby-mode/general/rreq
@ -1,4 +1,4 @@
 # name: require File.join(File.dirname(__FILE__), ...)
-# key: generalrreq
+# key: rreq
 # --
 require File.join(File.dirname(__FILE__), $0)
--- a/snippets/ruby-mode/general/y
+++ b/snippets/ruby-mode/general/y
@ -1,4 +1,4 @@
 # name: :yields: arguments (rdoc)
-# key: generaly
+# key: y
 # --
 :yields: $0
--- a/snippets/scala-mode/for.if
+++ b/snippets/scala-mode/for.if
@ -1,5 +1,6 @@
 # Author: Jonas Bonèr <jonas@jonasboner.com>
 # name: for (x <- xs if guard) { ... }
 # key: for
 # --
 for (${1:x} <- ${2:xs} if ${3:guard}) {
  $0
--- a/snippets/scala-mode/if
+++ b/snippets/scala-mode/if
@ -1,6 +1,6 @@
 # Author: Jonas Bonèr <jonas@jonasboner.com>
 # name: if (cond) { .. }
-# key: scala-modeif
+# key: if
 # --
 if (${1:condition}) {
  $0
--- a/snippets/scala-mode/if.else
+++ b/snippets/scala-mode/if.else
@ -1,5 +1,6 @@
 # Author: Jonas Bonèr <jonas@jonasboner.com>
 # name: if (cond) { .. } else { .. }
 # key: if
 # --
 if (${1:condition}) {
  $2
--- a/snippets/snippet-mode/vars
+++ b/snippets/snippet-mode/vars
@ -8,6 +8,5 @@
 # keybinding: ${5:keybinding}}${6:
 # expand-env: (${7:})}
 # contributor: $6
 # key: vars
 # --
 $0