Changes between Version 56 and Version 57 of UsingVimWithDjango

Timestamp:

Feb 29, 2012, 4:32:55 PM (12 years ago)

Author:

uws@…

Comment:

Improve surround.vim additions

UsingVimWithDjango

@@ -177 +177 @@
 == Surround Mappings ==
 
-This is for the popular surround script [http://www.vim.org/scripts/script.php?script_id=1697 here]
-
-in your .vimrc 
-{{{
-
-let g:surround_{char2nr("b")} = "{% block\1 \r..*\r &\1%}\r{% endblock %}"
-let g:surround_{char2nr("i")} = "{% if\1 \r..*\r &\1%}\r{% endif %}"
-let g:surround_{char2nr("w")} = "{% with\1 \r..*\r &\1%}\r{% endwith %}"
-let g:surround_{char2nr("c")} = "{% comment\1 \r..*\r &\1%}\r{% endcomment %}"
-let g:surround_{char2nr("f")} = "{% for\1 \r..*\r &\1%}\r{% endfor %}"
-let g:surround_{char2nr("v")} = "{{ \1 \r..*\r &\1\r }}"
-
-}}}
-
-now in visual mode type 
-
-    * 'sb' for block
-    * 'si' for an if statement
-    * 'sw' for a with statement
-    * 'sc' for a comment
-    * 'sf' for a for statement
-    * 'sv' for a variable 
+These are additional surroundings for the [http://www.vim.org/scripts/script.php?script_id=1697 surround plugin]:
+
+{{{
+let b:surround_{char2nr("v")} = "{{ \r }}"
+let b:surround_{char2nr("{")} = "{{ \r }}"
+let b:surround_{char2nr("%")} = "{% \r %}"
+let b:surround_{char2nr("b")} = "{% block \1block name: \1 %}\r{% endblock \1\1 %}"
+let b:surround_{char2nr("i")} = "{% if \1condition: \1 %}\r{% endif %}"
+let b:surround_{char2nr("w")} = "{% with \1with: \1 %}\r{% endwith %}"
+let b:surround_{char2nr("f")} = "{% for \1for loop: \1 %}\r{% endfor %}"
+let b:surround_{char2nr("c")} = "{% comment %}\r{% endcomment %}"
+}}}
+
+Put the above in ~/.vim/ftplugin/htmldjango.vim. Examples in visual mode (select some text first):
+
+    * type 'Sv' or 'S{' for a variable 
+    * type 'Sb' for a block
+    * type 'Si' for an if statement
+    * type 'Sw' for a with statement
+    * type 'Sc' for a comment
+    * type 'Sf' for a for statement
+    * type 'S%' for other template tags
 
 == Pony.vim ==