diff --git a/lib/base64.c b/lib/base64.c
index 49b2096f0..ecaa50d18 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -265,6 +265,6 @@ void *suck(int *lenptr) {
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/cookie.c b/lib/cookie.c
index 12e4074c2..97330cbc7 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -686,6 +686,6 @@ int main(int argc, char **argv)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/dict.c b/lib/dict.c
index 2bc350b31..98f705cac 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -237,6 +237,6 @@ CURLcode Curl_dict(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/dllinit.c b/lib/dllinit.c
index d4a276465..d71a1f911 100644
--- a/lib/dllinit.c
+++ b/lib/dllinit.c
@@ -87,6 +87,6 @@ DllMain (
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/easy.c b/lib/easy.c
index d79dbacef..43edce5f8 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -314,6 +314,6 @@ CURL *curl_easy_duphandle(CURL *incurl)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/escape.c b/lib/escape.c
index 10a863ece..88f4359f7 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -115,6 +115,6 @@ char *curl_unescape(const char *string, int length)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/file.c b/lib/file.c
index 1c9c6ba5f..2f2b1398d 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -201,6 +201,6 @@ CURLcode Curl_file(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/formdata.c b/lib/formdata.c
index 1c73e923c..0651a7b04 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -1463,6 +1463,6 @@ int main(int argc, char **argv)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/ftp.c b/lib/ftp.c
index 28e0479e7..d27c9ad81 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1870,6 +1870,6 @@ CURLcode Curl_ftp_disconnect(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/getdate.c b/lib/getdate.c
index 9eb43a408..b47bb2a9d 100644
--- a/lib/getdate.c
+++ b/lib/getdate.c
@@ -2131,6 +2131,6 @@ main (ac, av)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/getenv.c b/lib/getenv.c
index cb902a540..a99cba435 100644
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -71,6 +71,6 @@ char *curl_getenv(const char *v)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/getinfo.c b/lib/getinfo.c
index 6149073ac..b502609ea 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -138,6 +138,6 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/getpass.c b/lib/getpass.c
index 7476881ca..76af6fac9 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -249,6 +249,6 @@ char *getpass(const char *prompt)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/hostip.c b/lib/hostip.c
index f02829a9d..0a9e9f6e3 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -356,6 +356,6 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/http.c b/lib/http.c
index ea1e4b6c0..d12db0c8c 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -838,6 +838,6 @@ CURLcode Curl_http(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 9cb2aa473..17540796c 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -225,6 +225,6 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/if2ip.c b/lib/if2ip.c
index 92905ccfd..b70ed35e4 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -129,6 +129,6 @@ char *Curl_if2ip(char *interface, char *buf, int buf_size)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/krb4.c b/lib/krb4.c
index bbfda132b..fd7934e52 100644
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -395,6 +395,6 @@ void Curl_krb_kauth(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/ldap.c b/lib/ldap.c
index c8cc7e56d..860d058af 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -218,6 +218,6 @@ CURLcode Curl_ldap(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/memdebug.c b/lib/memdebug.c
index c8902c1d7..9999a54b2 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -161,6 +161,6 @@ int curl_fclose(FILE *file, int line, const char *source)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/mprintf.c b/lib/mprintf.c
index 375f4b3e0..4897b4001 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -1237,6 +1237,6 @@ int main()
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/netrc.c b/lib/netrc.c
index ae5a6734c..8b6844825 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -206,6 +206,6 @@ int main(int argc, char **argv)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/progress.c b/lib/progress.c
index 08611e920..3686340b6 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -337,6 +337,6 @@ int Curl_pgrsUpdate(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/security.c b/lib/security.c
index 61faa3128..c39f2a0b6 100644
--- a/lib/security.c
+++ b/lib/security.c
@@ -552,6 +552,6 @@ Curl_sec_end(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/sendf.c b/lib/sendf.c
index 240b65bfe..f23d00406 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -296,6 +296,6 @@ CURLcode Curl_read(struct connectdata *conn, int sockfd,
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/speedcheck.c b/lib/speedcheck.c
index 465a2aa0f..3860d10d6 100644
--- a/lib/speedcheck.c
+++ b/lib/speedcheck.c
@@ -72,6 +72,6 @@ CURLcode Curl_speedcheck(struct SessionHandle *data,
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 7dfdef621..11ef17728 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -725,6 +725,6 @@ Curl_SSLConnect(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/strequal.c b/lib/strequal.c
index 54ecb74bb..988f774bd 100644
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -112,6 +112,6 @@ size_t Curl_strlcat(char *dst, const char *src, size_t siz)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/strtok.c b/lib/strtok.c
index b80bdb138..e7724d93c 100644
--- a/lib/strtok.c
+++ b/lib/strtok.c
@@ -69,6 +69,6 @@ Curl_strtok_r(char *ptr, const char *sep, char **end)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/telnet.c b/lib/telnet.c
index ac40e18e6..c69ce31f5 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -1206,6 +1206,6 @@ CURLcode Curl_telnet(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/timeval.c b/lib/timeval.c
index 4099ede99..d30ff74b2 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -83,6 +83,6 @@ long Curl_tvlong (struct timeval t1)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/transfer.c b/lib/transfer.c
index 0a4c93e55..2a044a9ea 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1164,6 +1164,6 @@ Curl_Transfer(struct connectdata *c_conn, /* connection data */
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/url.c b/lib/url.c
index dd44b3864..2f85212e6 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2160,6 +2160,6 @@ CURLcode Curl_do(struct connectdata *conn)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */
diff --git a/lib/version.c b/lib/version.c
index ae3a865e1..ac30bf105 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -108,6 +108,6 @@ char *curl_version(void)
  * local variables:
  * eval: (load-file "../curl-mode.el")
  * end:
- * vim600: et sw=2 ts=2 sts=2 tw=78 fdm=marker
- * vim<600: et sw=2 ts=2 sts=2 tw=78
+ * vim600: fdm=marker
+ * vim: et sw=2 ts=2 sts=2 tw=78
  */