12 files changed, 15 insertions, 9 deletions
diff --git a/subx/examples/ex1.subx b/subx/examples/ex1.subx
index 579ac9f4..996ef955 100644
--- a/subx/examples/ex1.subx
+++ b/subx/examples/ex1.subx
@@ -17,4 +17,4 @@
   b8/copy                         .               .             .           .             .           .           .               1/imm32           # copy to EAX
   cd/syscall  0x80/imm8
 
-# vim:ft=subx
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex10.subx b/subx/examples/ex10.subx
index 78577a76..f2eadc5d 100644
--- a/subx/examples/ex10.subx
+++ b/subx/examples/ex10.subx
@@ -67,3 +67,5 @@ $argv_break:
 $argv_fail:
   b8/copy                         .               .             .           .             .           .           .               0/imm32           # copy to EAX
   c3/return
+
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex11.subx b/subx/examples/ex11.subx
index c53f8bd3..defab46b 100644
--- a/subx/examples/ex11.subx
+++ b/subx/examples/ex11.subx
@@ -346,4 +346,4 @@ Null_kernel_string:
 Abc_kernel_string:
   41/A 62/b 63/c 00/null
 
-# vim:ft=subx:nowrap:so=0
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex12.subx b/subx/examples/ex12.subx
index 8e0c95c3..d7c2e868 100644
--- a/subx/examples/ex12.subx
+++ b/subx/examples/ex12.subx
@@ -40,4 +40,4 @@ mmap_new_segment:  # type mmap_arg_struct
   # offset
   00 00 00 00  # 0 since MAP_ANONYMOUS is specified
 
-# vim:ft=subx:nowrap:tw&
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex2.subx b/subx/examples/ex2.subx
index 2a055bcc..800674f1 100644
--- a/subx/examples/ex2.subx
+++ b/subx/examples/ex2.subx
@@ -17,4 +17,4 @@
   b8/copy                         .               .             .           .             .           .           .               1/imm32           # copy to EAX
   cd/syscall  0x80/imm8
 
-# vim:ft=subx
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex3.subx b/subx/examples/ex3.subx
index caa4d9cf..bbb6f1a7 100644
--- a/subx/examples/ex3.subx
+++ b/subx/examples/ex3.subx
@@ -32,4 +32,4 @@ $exit:
   b8/copy                         .               .             .           .             .           .           .               1/imm32           # copy to EAX
   cd/syscall  0x80/imm8
 
-# vim:ft=subx:nowrap
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex4.subx b/subx/examples/ex4.subx
index 2d5f05b2..946a4810 100644
--- a/subx/examples/ex4.subx
+++ b/subx/examples/ex4.subx
@@ -39,4 +39,4 @@
 x:
   00 00 00 00  # space for read() to write to
 
-# vim:ft=subx:nowrap
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex5.subx b/subx/examples/ex5.subx
index af9f1b3a..d773b366 100644
--- a/subx/examples/ex5.subx
+++ b/subx/examples/ex5.subx
@@ -39,4 +39,4 @@
   b8/copy                         .               .             .           .             .           .           .               1/imm32/exit      # copy to EAX
   cd/syscall  0x80/imm8
 
-# vim:ft=subx:nowrap
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex6.subx b/subx/examples/ex6.subx
index 9172cab3..256aa47c 100644
--- a/subx/examples/ex6.subx
+++ b/subx/examples/ex6.subx
@@ -32,4 +32,4 @@ x:  # string to print
   48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
 # H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null
 
-# vim:ft=subx:nowrap
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex7.subx b/subx/examples/ex7.subx
index c41e5ad2..d5956ec9 100644
--- a/subx/examples/ex7.subx
+++ b/subx/examples/ex7.subx
@@ -100,4 +100,4 @@ b:
 filename:
   2e 66 6f 6f 00 00 00 00
 
-# vim:ft=subx:nowrap:tw&
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex8.subx b/subx/examples/ex8.subx
index 1406cded..ccc6dcb9 100644
--- a/subx/examples/ex8.subx
+++ b/subx/examples/ex8.subx
@@ -53,3 +53,5 @@ $ascii_length_loop:
 $ascii_length_ret:
   # return (result in EAX)
   c3/return
+
+# vim:nowrap:textwidth=0
diff --git a/subx/examples/ex9.subx b/subx/examples/ex9.subx
index ed723e4a..c5711ef1 100644
--- a/subx/examples/ex9.subx
+++ b/subx/examples/ex9.subx
@@ -46,3 +46,5 @@ ascii_difference:  # (s1, s2) : null-terminated ascii strings
   # a-b
   29/subtract                     3/mod/direct    0/rm32/EAX    .           .             .           1/r32/ECX   .               .                 # subtract ECX from EAX
   c3/return
+
+# vim:nowrap:textwidth=0