update filetype settings for text and html

1 files changed, 5 insertions, 1 deletions

diff --git a/vimrc b/vimrc
index 22860cf..47b23e4 100644
--- a/vimrc
+++ b/vimrc
@@ -35,10 +35,13 @@ if has("autocmd")
   filetype plugin indent on
 
   au!
-  au FileType text setlocal textwidth=78
+  au FileType text setlocal textwidth=72
   au FileType html setlocal ts=2 sw=2 sts=2 expandtab
   au FileType ruby setlocal ts=2 sw=2 sts=2 expandtab
 
+  " text files
+  au BufRead,BufNewFile *.txt      setlocal filetype=text
+
   " php files
   au BufRead,BufNewFile *.module    setlocal filetype=php
   au BufRead,BufNewFile *.inc       setlocal filetype=php
@@ -46,6 +49,7 @@ if has("autocmd")
 
   " html templates
   au BufRead,BufNewFile *.mako      setlocal filetype=html
+  au BufRead,BufNewFile *.ftl      setlocal filetype=html
 
   " When editing a file, always jump to the last known cursor position.
   " Don't do it when the position is invalid or when inside an event handler