Issue #1656 - Remove more vim control lines.

Vim control lines were re-introduced or not entirely cleaned up.
This nukes them again.
Removing from embedding, extensions, gfx, hal, ipc, layout, mailnews,
media and memory. More to come.

38 files changed, 0 insertions, 44 deletions

diff --git a/media/ffvpx/config.h b/media/ffvpx/config.h
index db2f7b42e1..eb25c35f28 100644
--- a/media/ffvpx/config.h
+++ b/media/ffvpx/config.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/ffvpx/libavcodec/dummy_funcs.c b/media/ffvpx/libavcodec/dummy_funcs.c
index f99702a0f6..49b8d126f9 100644
--- a/media/ffvpx/libavcodec/dummy_funcs.c
+++ b/media/ffvpx/libavcodec/dummy_funcs.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/ffvpx/libavutil/dummy_funcs.c b/media/ffvpx/libavutil/dummy_funcs.c
index 5d1cdc8191..120efc1190 100644
--- a/media/ffvpx/libavutil/dummy_funcs.c
+++ b/media/ffvpx/libavutil/dummy_funcs.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/ffvpx/libavutil_visibility.h b/media/ffvpx/libavutil_visibility.h
index 706aacdf32..a03c89cffe 100644
--- a/media/ffvpx/libavutil_visibility.h
+++ b/media/ffvpx/libavutil_visibility.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/highway/moz.build b/media/highway/moz.build
index da8876c5b7..75b9099671 100644
--- a/media/highway/moz.build
+++ b/media/highway/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libav/avfft_dummy_funcs.c b/media/libav/avfft_dummy_funcs.c
index 929dc6d923..c2e1300693 100644
--- a/media/libav/avfft_dummy_funcs.c
+++ b/media/libav/avfft_dummy_funcs.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libav/avfft_perms.h b/media/libav/avfft_perms.h
index b223e67111..f22fbcb671 100644
--- a/media/libav/avfft_perms.h
+++ b/media/libav/avfft_perms.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libav/config.h b/media/libav/config.h
index 96c5ea9506..0e869bce19 100644
--- a/media/libav/config.h
+++ b/media/libav/config.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build
index 0da04dabc3..2281486de4 100644
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libjxl/include/jxl/jxl_export.h b/media/libjxl/include/jxl/jxl_export.h
index 31834ec9e8..67cc98bb80 100644
--- a/media/libjxl/include/jxl/jxl_export.h
+++ b/media/libjxl/include/jxl/jxl_export.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libjxl/include/jxl/jxl_threads_export.h b/media/libjxl/include/jxl/jxl_threads_export.h
index b08aabe760..1bf729986f 100644
--- a/media/libjxl/include/jxl/jxl_threads_export.h
+++ b/media/libjxl/include/jxl/jxl_threads_export.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libjxl/moz.build b/media/libjxl/moz.build
index 3c55db02c3..16fb7e2a8d 100644
--- a/media/libjxl/moz.build
+++ b/media/libjxl/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libsoundtouch/src/SoundTouchFactory.cpp b/media/libsoundtouch/src/SoundTouchFactory.cpp
index d33fc133d7..01c9da478e 100644
--- a/media/libsoundtouch/src/SoundTouchFactory.cpp
+++ b/media/libsoundtouch/src/SoundTouchFactory.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libsoundtouch/src/SoundTouchFactory.h b/media/libsoundtouch/src/SoundTouchFactory.h
index 98d8a7deb1..3efcb10457 100644
--- a/media/libsoundtouch/src/SoundTouchFactory.h
+++ b/media/libsoundtouch/src/SoundTouchFactory.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libsoundtouch/src/moz.build b/media/libsoundtouch/src/moz.build
index 0912889f6f..dabb2754e1 100644
--- a/media/libsoundtouch/src/moz.build
+++ b/media/libsoundtouch/src/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libsoundtouch/src/soundtouch_perms.h b/media/libsoundtouch/src/soundtouch_perms.h
index 0af2fe6183..7eff1e3c2a 100644
--- a/media/libsoundtouch/src/soundtouch_perms.h
+++ b/media/libsoundtouch/src/soundtouch_perms.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libstagefright/binding/Box.cpp b/media/libstagefright/binding/Box.cpp
index 4bef10816b..d058dc696d 100644
--- a/media/libstagefright/binding/Box.cpp
+++ b/media/libstagefright/binding/Box.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libstagefright/binding/ResourceStream.cpp b/media/libstagefright/binding/ResourceStream.cpp
index 2fd042cf4f..4ccba2bb71 100644
--- a/media/libstagefright/binding/ResourceStream.cpp
+++ b/media/libstagefright/binding/ResourceStream.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libstagefright/binding/include/mp4_demuxer/AtomType.h b/media/libstagefright/binding/include/mp4_demuxer/AtomType.h
index 95baedfe70..e1d5440a68 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/AtomType.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/AtomType.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libstagefright/binding/include/mp4_demuxer/Box.h b/media/libstagefright/binding/include/mp4_demuxer/Box.h
index 6612f6b49e..d1c0f1050d 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/Box.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/Box.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/libtheora/moz.build b/media/libtheora/moz.build
index 6f9916544f..b0b46cfd04 100644
--- a/media/libtheora/moz.build
+++ b/media/libtheora/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libtremor/lib/moz.build b/media/libtremor/lib/moz.build
index ded81ee72b..94d07583b7 100644
--- a/media/libtremor/lib/moz.build
+++ b/media/libtremor/lib/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libwebp/dsp/moz.build b/media/libwebp/dsp/moz.build
index 6e2c9deb2c..8a3fb27875 100644
--- a/media/libwebp/dsp/moz.build
+++ b/media/libwebp/dsp/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libwebp/enc/moz.build b/media/libwebp/enc/moz.build
index 12eaf5a5ed..8e67694e73 100644
--- a/media/libwebp/enc/moz.build
+++ b/media/libwebp/enc/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/media/libyuv/libyuv.gyp b/media/libyuv/libyuv.gyp
index f73a1a4b74..7f4ac5e70d 100644
--- a/media/libyuv/libyuv.gyp
+++ b/media/libyuv/libyuv.gyp
@@ -155,8 +155,3 @@
   ], # targets.
 }
 
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp b/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
index b56c272f9e..438c90ea79 100644
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: softtabstop=2:shiftwidth=2:expandtab
- * */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.h b/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.h
index 31de8ccb2e..7bb1f2ab49 100644
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.h
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.h
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: softtabstop=2:shiftwidth=2:expandtab
- * */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/tools/gyp/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp b/media/webrtc/trunk/tools/gyp/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp
index 217dbb0479..13dca0942f 100644
--- a/media/webrtc/trunk/tools/gyp/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp
+++ b/media/webrtc/trunk/tools/gyp/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp
@@ -94,4 +94,3 @@
   }], # targets
 }
 
-# vim:ai:ts=4:sts=4:sw=2:expandtab:textwidth=70
diff --git a/media/webrtc/trunk/tools/gyp/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp b/media/webrtc/trunk/tools/gyp/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp
index c1b1241fb7..73952f8a75 100644
--- a/media/webrtc/trunk/tools/gyp/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp
+++ b/media/webrtc/trunk/tools/gyp/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp
@@ -84,4 +84,3 @@
   }], # targets
 }
 
-# vim:ai:ts=4:sts=4:sw=2:expandtab:textwidth=70
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp
index da152a1d59..1892dd2559 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.h b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.h
index d6e5f47ee4..a643bd5b79 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.h
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp
index a1869f1807..0c8f9f0d06 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.h b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.h
index 7d66303a3b..e6c537085a 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.h
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp
index 55bea7e7b7..841983dcb2 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.h b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.h
index 7da9012e20..a192280c79 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.h
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/DShowTools.h b/media/webrtc/trunk/webrtc/modules/video_capture/windows/DShowTools.h
index 4bb0a4a17d..ba64614c1e 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/DShowTools.h
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/DShowTools.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp b/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp
index f067094463..df8cf77519 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.h b/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.h
index 033ce52e36..f515323d82 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.h
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */