aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-02-22 22:06:37 +0100
committerDiego Biurrun <diego@biurrun.de>2013-02-24 18:42:02 +0100
commitdc745b76aa9a7682004c96372a9e77549de1b765 (patch)
treebd1f7d475f80f603be90d43d84010406ff157a41
parentb6ae41e7f42500b43bbfa346469ed88e0f66dadf (diff)
downloadffmpeg-dc745b76aa9a7682004c96372a9e77549de1b765.tar.gz
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
-rw-r--r--doc/developer.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/developer.texi b/doc/developer.texi
index 682a239abb..7d39f2db88 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/