looks nicer and is better compatible with older vim versions

diff --git a/lib/base64.c b/lib/base64.c
index 49b2096f0b4a3ab99a5efd292a8a2351d34e2e42..ecaa50d18e4930598467b30367fcbec74eb7ec9d 100644 (file)
--- 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 12e4074c283485083f5cc9452a7fc1815a92b037..97330cbc78a4de2e1f8e911eb31ac10bcb4d4e0d 100644 (file)
--- 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 2bc350b3167f6a9663be102ec5eb78a8560efa65..98f705cac38eaf67c70748cabf7f4ef90fc91187 100644 (file)
--- 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 d4a2764658311ba293b9ecb9b0ba06708db1ec3f..d71a1f91180842985ea2d7895f724f305df399b0 100644 (file)
--- 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 d79dbacefcbac6dd633604e651e1c68ac9adc5a1..43edce5f89d46c552f6a40b9c54ac2143fd5741b 100644 (file)
--- 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 10a863ece024ffc67ce6f25bf86493019af869c2..88f4359f75f9fe07e274b73ffa58f5f87c430514 100644 (file)
--- 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 1c9c6ba5f128301695708af511745b990c23d9e8..2f2b1398db06150f17407f78c4151a35e7792f16 100644 (file)
--- 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 1c73e923c878c9eef74cb63ce311a3d476c7b937..0651a7b04c5b78a91cbbed2af049edaf67fd489b 100644 (file)
--- 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 28e0479e7919e001a21e9869b79f45ab66c4c2fd..d27c9ad816d16cd43be889160be4fbd84a04a66b 100644 (file)
--- 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 9eb43a4089106e91cd5333abaa502db0181a32ab..b47bb2a9de72d3d966ab14b42897b1d9e313f192 100644 (file)
--- 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 cb902a540c2c1774e367aae172c6e22640ebe6e7..a99cba435f40e113356f001d954d86d400da86ea 100644 (file)
--- 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 6149073ac6cb9aa18e2c87043be8fc063b35218f..b502609ead8bd2f2052a58fd722ea4f6d572b2ae 100644 (file)
--- 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 7476881cada09ab51ed01612aeac78c3ae2335a2..76af6fac9a59b124f8b5e5324ff89338327c3956 100644 (file)
--- 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 f02829a9d98a1f444738a52f02ceadac59621247..0a9e9f6e342a6ce5b74485e1f823342bceaec730 100644 (file)
--- 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 ea1e4b6c0840e0735ff156e8547b1ec35edc9c81..d12db0c8c59b1efcba7d1d430ef4d59072c13420 100644 (file)
--- 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 9cb2aa47376adb22303175734696c879ba601282..17540796c478174f182c9017c2e50f158817b14d 100644 (file)
--- 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 92905ccfdceff3997b0daf5e284679d5efaa9b6c..b70ed35e4609369624c54267f7e16799213702dd 100644 (file)
--- 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 bbfda132b5a6af099a4f5b67a80b114970f7def1..fd7934e52e9251f2b6b961068bd4da43f916971a 100644 (file)
--- 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 c8cc7e56d88809f0de2734b82c3c09b6982a1066..860d058afb9cda0abd8efb7ab7342c6234f6c477 100644 (file)
--- 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 c8902c1d73091daf5e8bd9c0ffb4fc48b02fb22f..9999a54b26e3e99e51f2c2d90ee3934217b38845 100644 (file)
--- 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 375f4b3e0e25b51160b1e1742959fbe246501fd1..4897b4001a364978b093012f64ff1819c2408e78 100644 (file)
--- 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 ae5a6734c2fe561e0414398e7c3f124b5a7c5167..8b684482588c83dd88cbf6f6643b62b52f30cb48 100644 (file)
--- 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 08611e9207ae07e1b8e8d84a9bfd34159126b2f4..3686340b615c7515407dff125442bee7303ac95b 100644 (file)
--- 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 61faa3128345e4f7e9fa45ae12644ed7f98cead1..c39f2a0b608ee47a23cfb343a5380d5fe945d1dd 100644 (file)
--- 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 240b65bfe32602a213db3845654e0b2dc9b9290f..f23d004063ed9823e4ea047e376f1668bd4c2f06 100644 (file)
--- 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 465a2aa0f99708368acdeec5e784118d95cd057f..3860d10d6870c499178ecbc84944ffbfd9e254ff 100644 (file)
--- 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 7dfdef6213bc226465f667d0099bdd01928e82b4..11ef177286db8f69f27a98cf0b7060a06ccd9ce0 100644 (file)
--- 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 54ecb74bb550f4fbd7e1c574bba5b6f4ac4aa648..988f774bd3947e45f68aae93b902ce2aac261e2a 100644 (file)
--- 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 b80bdb138fa5cc8f5ea83801743adef607e18cde..e7724d93cbb3473eadc072ef6ac6b49fe0de4059 100644 (file)
--- 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 ac40e18e6a7c29a222dea838107f1fc8be4fb3e6..c69ce31f5bea9681c249f3430421502c442f8087 100644 (file)
--- 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 4099ede99d3b297c334bc600f0e33035e544b2da..d30ff74b2d6ec7804db2b424c6f68a6744596bd5 100644 (file)
--- 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 0a4c93e55aa870a32abc09b88b4ff473f77d89ec..2a044a9ea4deb617733ad060e0499d3e37ed433e 100644 (file)
--- 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 dd44b3864cbf3dcfb16241635709c4a5fab99a6b..2f85212e60afc720402c230c9a41e171d107d8b7 100644 (file)
--- 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 ae3a865e1bbfd6e5ebf4bc47a5bfd2690a65c776..ac30bf10570b1ddb5742eb16dbc68a7d9acf7f93 100644 (file)
--- 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
  */