[FFmpeg-cvslog] doc: developer: Allow tabs in the vim configuration for Automake files

[Diego Biurrun]

ffmpeg | branch: release/1.1 | Diego Biurrun <diego at biurrun.de> | Fri Feb 22 22:06:37 2013 +0100| [dc745b76aa9a7682004c96372a9e77549de1b765] | committer: Diego Biurrun

doc: developer: Allow tabs in the vim configuration for Automake files

While we do not use Automake in libav, this allows our config to be
used more globally without introducing unwanted breakage.
(cherry picked from commit 040c565e51985477a8fa5e42d2ddfb26ebde6608)

Conflicts:

	doc/developer.texi

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc745b76aa9a7682004c96372a9e77549de1b765
---

 doc/developer.texi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/developer.texi b/doc/developer.texi
index 682a239..7d39f2d 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -221,8 +221,8 @@ set shiftwidth=4
 set softtabstop=4
 set cindent
 set cinoptions=(0
-" allow tabs in Makefiles
-autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=8
+" Allow tabs in Makefiles.
+autocmd FileType make,automake set noexpandtab shiftwidth=8 softtabstop=8
 " Trailing whitespace and tabs are forbidden, so highlight them.
 highlight ForbiddenWhitespace ctermbg=red guibg=red
 match ForbiddenWhitespace /\s\+$\|\t/