summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-03-05 17:52:27 +0000
committerUrbain Vaes <urbain@vaes.uk>2015-03-05 17:52:27 +0000
commit0c66cb2c416e37338d2af2ae6ba484fed38f3916 (patch)
tree1728a33f29b5b29c394a76d93f8bca3cabc244be
parent862eeacabcfb35d709d5cc4ac964c92420c69b02 (diff)
parent808d4e68bc94826edd020cb5b498bc547f2e12f2 (diff)
fixing merge conflict
-rw-r--r--.gitignore2
-rw-r--r--vim/mySnippets/all.snippets4
-rw-r--r--vim/mySnippets/tex.snippets12
3 files changed, 17 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b93334c..004d84e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ vim/bundle/
vifm/Trash/
mutt/mutt-colors-solarized/
mutt/temp/
+passwords
+mutt/cache/
diff --git a/vim/mySnippets/all.snippets b/vim/mySnippets/all.snippets
index 8b13789..9328a1e 100644
--- a/vim/mySnippets/all.snippets
+++ b/vim/mySnippets/all.snippets
@@ -1 +1,3 @@
-
+snippet jul "Jul the boss"
+Jul is the boss of ${0:dance}
+endsnippet
diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index 64f665b..1ff2e03 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -33,3 +33,15 @@ endsnippet
snippet red "Red text" i
\red{$1} $0
endsnippet
+
+snippet sumi "Sum over index set" i
+\sum_{${1:i} \in ${2:I}} $0
+endsnippet
+
+snippet ip "Inner product" i
+\ip{$1}{$2} $0
+endsnippet
+
+snippet norm "Norm" i
+\norm{$1} $0
+endsnippet