diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-02-22 22:06:37 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-02-24 19:32:52 +0100 |
| commit | c3829f7085c5d5f5e860f301cc8285b3963913ee (patch) | |
| tree | b15208fdafcbc61c81367ffc35a6b8e8d1a30b06 | |
| parent | f20764102b9fb7f01b1e0be0f73b5212d084269a (diff) | |
| download | ffmpeg-c3829f7085c5d5f5e860f301cc8285b3963913ee.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.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index c189de1870..4b5d6af9ed 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -215,8 +215,8 @@ the following snippet into your @file{.vimrc}: set expandtab set shiftwidth=4 set softtabstop=4 -" 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/ |