Merge remote-tracking branch 'origin/tracking' into custom

mailnews/base/util/nsMsgProtocol.cpp

@@ -1547,4 +1547,3 @@ char16_t *FormatStringWithHostNameByName(const char16_t* stringName, nsIMsgMailN
   return ptrv;
 }
 
-// vim: ts=2 sw=2

mailnews/jsaccount/public/msgIDelegateList.idl

@@ -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/. */

mailnews/jsaccount/public/msgIOverride.idl

@@ -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/. */

mailnews/local/src/nsMailboxProtocol.cpp

@@ -718,4 +718,3 @@ nsresult nsMailboxProtocol::CloseSocket()
   return NS_OK;
 }
 
-// vim: ts=2 sw=2

mailnews/mime/src/jsmime.jsm

@@ -1,7 +1,6 @@
 /* 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/. */
-// vim:set ts=2 sw=2 sts=2 et ft=javascript:
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 

mailnews/mime/src/mimeParser.jsm

@@ -1,7 +1,6 @@
 /* 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/. */
-// vim:set ts=2 sw=2 sts=2 et ft=javascript:
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");