Update vim modelines.

src/bptr.h

@@ -103,8 +103,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_file.cpp

@@ -89,8 +89,4 @@ console_t console_file =
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_init.cpp

@@ -159,8 +159,4 @@ void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...)
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_none.cpp

@@ -75,8 +75,4 @@ console_t console_none =
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_screen.cpp

@@ -317,8 +317,4 @@ console_t console_screen =
 
 #endif /* USE_SCREEN */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/compress.cpp

@@ -215,8 +215,4 @@ int upx_test_overlap       ( const upx_bytep buf,
     return r;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/compress.h

@@ -128,8 +128,4 @@ unsigned upx_zlib_crc32  (const void *buf, unsigned len, unsigned crc);
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/compress_lzma.cpp

@@ -813,7 +813,5 @@ const char *upx_lzma_version_string(void)
 
 
 #endif /* WITH_LZMA */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */

src/compress_ucl.cpp

@@ -306,7 +306,5 @@ unsigned upx_ucl_crc32(const void *buf, unsigned len, unsigned crc)
 #endif
 
 #endif /* WITH_UCL */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */

src/compress_zlib.cpp

@@ -250,7 +250,5 @@ unsigned upx_zlib_crc32(const void *buf, unsigned len, unsigned crc)
 
 
 #endif /* WITH_ZLIB */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */

src/conf.h

@@ -719,8 +719,4 @@ int upx_test_overlap       ( const upx_bytep buf,
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/console.h

@@ -187,8 +187,4 @@ extern console_t console_screen;
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/except.cpp

@@ -205,8 +205,4 @@ const char *prettyName(const char *n) NOTHROW
     return n;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/except.h

@@ -230,8 +230,4 @@ void throwEOFException(const char *msg = NULL, int e = 0) NORET;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/file.cpp

@@ -492,8 +492,4 @@ void MemoryOutputFile::write(const void *buf, int len)
 
 #endif /* if 0 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/file.h

@@ -185,8 +185,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter.cpp

@@ -228,8 +228,4 @@ bool Filter::scan(const upx_byte *buf_, unsigned buf_len_)
     return false;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter.h

@@ -131,8 +131,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filteri.cpp

@@ -260,8 +260,4 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
 
 const int FilterImp::n_filters = TABLESIZE(filters);
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/help.cpp

@@ -419,8 +419,4 @@ void show_version(int x)
     fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type '%s -L'.\n", progname);
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/lefile.cpp

@@ -360,8 +360,4 @@ void LeFile::countFixups(unsigned *counts) const
     counts[o+1] += 4; // extra space for 0xFFFFFFFF
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/lefile.h

@@ -221,8 +221,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/linker.cpp

@@ -967,8 +967,4 @@ void ElfLinkerX86::relocate1(const Relocation *rel, upx_byte *location,
         super::relocate1(rel, location, value, type);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/linker.h

@@ -263,8 +263,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/main.cpp

@@ -1570,8 +1570,4 @@ int __acc_cdecl_main main(int argc, char *argv[])
 
 #endif /* !(WITH_GUI) */
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/msg.cpp

@@ -253,8 +253,4 @@ void infoWriting(const char *what, long size)
     info("Writing %s: %ld bytes", what, size);
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/options.h

@@ -168,8 +168,4 @@ extern struct options_t *opt;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_armpe.cpp

@@ -259,7 +259,4 @@ void PackArmPe::pack(OutputFile *fo)
     super::pack0(fo, 1U << 9, 0x10000, true);
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_armpe.h

@@ -78,7 +78,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_com.cpp

@@ -266,8 +266,4 @@ Linker* PackCom::newLinker() const
     return new ElfLinkerX86();
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_com.h

@@ -66,8 +66,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_djgpp2.cpp

@@ -469,8 +469,4 @@ void PackDjgpp2::unpack(OutputFile *fo)
         handle_allegropak(fi, fo);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_djgpp2.h

@@ -107,8 +107,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_elf.h

@@ -438,8 +438,4 @@ typedef ElfClass_LE64::External_Note    Elf_LE64_External_Note;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_elf_enum.h

@@ -245,7 +245,4 @@
     };
 #endif
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_elks.cpp

@@ -171,9 +171,4 @@ void PackElks8086::unpack(OutputFile *)
 
 #endif /* if 0 */
 
-
-/*
-vi:ts=4:et
-*/
-
-
+/* vim:set ts=4 sw=4 et: */

src/p_exe.cpp

@@ -870,8 +870,4 @@ DDnneelllCCCCCCCCCCCCCCCCCCCCCCCCC
 
 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_exe.h

@@ -118,8 +118,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_exc.cpp

@@ -614,8 +614,4 @@ void PackLinuxI386::updateLoader(OutputFile *fo)
     elfout.ehdr.e_entry = fo->getBytesWritten() + elfout.phdr[0].p_vaddr;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_interp.cpp

@@ -306,8 +306,4 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
 #undef MAX_INTERP_HDR
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_interp.h

@@ -61,8 +61,4 @@ protected:
 
 #endif /*} already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_sh.cpp

@@ -168,7 +168,4 @@ PackLinuxI386sh::pack3(OutputFile *fo, Filter &ft)
     elfout.phdr[0].p_filesz = fo->getBytesWritten();
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_sh.h

@@ -71,8 +71,4 @@ protected:
 
 #endif /*} already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_mach.cpp

@@ -2501,6 +2501,4 @@ void PackMachFat::list()
     assert(false);
 }
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_mach.h

@@ -1071,8 +1071,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_mach_enum.h

@@ -149,7 +149,4 @@
     };
 #endif  /*}*/
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_ps1.cpp

@@ -738,7 +738,4 @@ void PackPs1::unpack(OutputFile *fo)
     }
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_ps1.h

@@ -130,7 +130,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_sys.cpp

@@ -125,8 +125,4 @@ void PackSys::buildLoader(const Filter *ft)
              );
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_sys.h

@@ -58,8 +58,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_tmt.cpp

@@ -360,8 +360,4 @@ void PackTmt::unpack(OutputFile *fo)
     copyOverlay(fo, overlay, &obuf);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_tmt.h

@@ -79,8 +79,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_tos.cpp

@@ -774,8 +774,4 @@ void PackTos::unpack(OutputFile *fo)
     }
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_tos.h

@@ -108,8 +108,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_unix.cpp

@@ -638,8 +638,4 @@ void PackUnix::unpack(OutputFile *fo)
         throwChecksumError();
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_unix.h

@@ -216,8 +216,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_vmlinx.cpp

@@ -1215,8 +1215,4 @@ template class PackVmlinuxBase<ElfClass_LE32>;
 template class PackVmlinuxBase<ElfClass_BE32>;
 template class PackVmlinuxBase<ElfClass_LE64>;
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_vmlinx.h

@@ -243,8 +243,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_vmlinz.cpp

@@ -1068,8 +1068,4 @@ void PackVmlinuzARMEL::unpack(OutputFile *fo)
     }
 }
 
-/*
-vi:ts=4:et
-*/
-
-
+/* vim:set ts=4 sw=4 et: */

src/p_vmlinz.h

@@ -197,8 +197,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_vxd.h

@@ -66,8 +66,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_w16ne.cpp

@@ -131,8 +131,4 @@ void PackW16Ne::unpack(OutputFile *)
     throwCantUnpack("not yet implemented");
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_w16ne.h

@@ -63,8 +63,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_w32pe.cpp

@@ -292,7 +292,4 @@ void PackW32Pe::pack(OutputFile *fo)
     super::pack0(fo, 0x0c, 0x400000, false);
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_w32pe.h

@@ -68,7 +68,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_w64pep.cpp

@@ -278,7 +278,4 @@ void PackW64Pep::pack(OutputFile *fo)
     super::pack0(fo, 0x0c, 0x0000000140000000ULL);
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_w64pep.h

@@ -64,7 +64,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_wcle.cpp

@@ -857,8 +857,4 @@ void PackWcle::unpack(OutputFile *fo)
     copyOverlay(fo, overlay, &oimage);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_wcle.h

@@ -90,8 +90,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/packer.cpp

@@ -1593,8 +1593,4 @@ void Packer::compressWithFilters(Filter *ft,
     ibuf.checkState(); obuf.checkState();
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/packer.h

@@ -332,8 +332,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/packer_c.cpp

@@ -296,8 +296,4 @@ void Packer::defineDecompressorSymbols()
     }
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/packer_f.cpp

@@ -357,8 +357,4 @@ void Packer::defineFilterSymbols(const Filter *ft)
 #endif
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/packmast.cpp

@@ -422,8 +422,4 @@ void PackMaster::fileInfo()
     p->doFileInfo();
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/packmast.h

@@ -68,8 +68,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/pefile.cpp

@@ -3102,7 +3102,4 @@ void PeFile64::processTls(Reloc *r, const Interval *iv, unsigned a)
 */
 
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/pefile.h

@@ -538,7 +538,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/s_djgpp2.cpp

@@ -434,6 +434,4 @@ screen_t *screen_djgpp2_construct(void) { return sobject_construct(&driver, size
 
 #endif /* (USE_SCREEN) && defined(__DJGPP__) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/s_object.cpp

@@ -82,6 +82,4 @@ screen_t *sobject_construct(const screen_t *c, size_t data_size) {
 
 #endif /* (USE_SCREEN) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/s_vcsa.cpp

@@ -491,6 +491,4 @@ screen_t *screen_vcsa_construct(void) { return sobject_construct(&driver, sizeof
 
 #endif /* (USE_SCREEN) && (USE_SCREEN_VCSA) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/s_win32.cpp

@@ -412,6 +412,4 @@ screen_t *screen_win32_construct(void) { return sobject_construct(&driver, sizeo
 
 #endif /* (USE_SCREEN_WIN32) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/screen.h

@@ -101,6 +101,4 @@ void screen_show_frames(screen_t *);
 
 #endif /* already included */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/snprintf.h

@@ -55,6 +55,4 @@ size_t upx_strlen(const char *);
 
 #endif /* already included */
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */

src/stdcxx.cpp

@@ -43,6 +43,4 @@ char *__cxa_demangle(const char *mangled_name, char *buf, size_t *n, int *status
 } /* extern "C" */
 #endif
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */

src/stdcxx.h

@@ -53,6 +53,4 @@
 
 #endif /* already included */
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */

src/stub/src/amd64-darwin.dylib-entry.S

@@ -321,6 +321,4 @@ f_unfilter:
 
 dy_top:
 
-
-
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-darwin.macho-entry.S

@@ -225,4 +225,4 @@ main:
         call unfold
             // compressed fold_elf86 follows
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-darwin.macho-fold.S

@@ -113,7 +113,4 @@ read: .globl read
 0:
         ret
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-darwin.macho-main.c

@@ -642,8 +642,4 @@ ERR_LAB
     return entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/stub/src/amd64-darwin.macho-upxmain.c

@@ -749,6 +749,4 @@ main(int argc, char *argv[])
     return 0;
 }
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */

src/stub/src/amd64-darwin.macho-upxsubr.S

@@ -88,3 +88,5 @@ GLOBAL(read)
         or $~0,%rax  //mov errno,eax
 0:
         ret
+
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-linux.elf-entry.S

@@ -309,7 +309,4 @@ main:
 
 /*__XTHEENDX__*/
 
-/*
-vi:ts=8:et:nowrap
- */
-
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-linux.elf-fold.S

@@ -149,4 +149,4 @@ close: .globl close
 exit: .globl exit
         movb $ __NR_exit,%al; jmp sysgo
 
-# vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-linux.elf-main.c

@@ -366,8 +366,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/stub/src/amd64-linux.kernel.vmlinux-head.S

@@ -1,3 +1,3 @@
 #include "i386-linux.kernel.vmlinux-head.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-linux.kernel.vmlinux.S

@@ -1,3 +1,3 @@
 #include "i386-linux.kernel.vmlinux.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-linux.shlib-init.S

@@ -411,7 +411,4 @@ L220:
 
 /*__XTHEENDX__*/
 
-/*
-vi:ts=8:et:nowrap
- */
-
+/* vim:set ts=8 sw=8 et: */

src/stub/src/amd64-win64.pep.S

@@ -504,4 +504,4 @@ done_callbacks:
 
 #include        "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */

src/stub/src/arm.v4a-linux.elf-entry.S

@@ -265,7 +265,4 @@ L71:
 cpr0: .globl cpr0
         /* { b_info={sz_unc, sz_cpr, {4 char}}, folded_loader...} */
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */

src/stub/src/arm.v4a-linux.elf-fold.S

@@ -447,5 +447,4 @@ div10: .globl div10
 
 #endif  /*}*/
 
-@ vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */