Merge pull request #1370 from gaul/vim/modeline

Correct vim modeline to 2-space indentation

src/addhead.cpp

@@ -279,9 +279,9 @@ bool AdditionalHeader::Dump() const
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/addhead.h

@@ -62,9 +62,9 @@ class AdditionalHeader
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/cache.cpp

@@ -799,9 +799,9 @@ bool convert_header_to_stat(const char* path, headers_t& meta, struct stat* pst,
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/cache.h

@@ -168,9 +168,9 @@ bool convert_header_to_stat(const char* path, headers_t& meta, struct stat* pst,
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/common.h

@@ -204,9 +204,9 @@ extern const char*    s3fs_log_nest[S3FS_LOG_NEST_MAX];
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/common_auth.cpp

@@ -88,9 +88,9 @@ string s3fs_sha256sum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/curl.cpp

@@ -4923,9 +4923,9 @@ acl_t string_to_acl(const char *acl)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/curl.h

@@ -601,9 +601,9 @@ acl_t string_to_acl(const char *acl);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/fdcache.cpp

@@ -3505,9 +3505,9 @@ bool FdManager::CheckAllCache()
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/fdcache.h

@@ -282,9 +282,9 @@ class FdManager
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/gnutls_auth.cpp

@@ -388,9 +388,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/nss_auth.cpp

@@ -260,9 +260,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/openssl_auth.cpp

@@ -360,9 +360,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/psemaphore.h

@@ -73,3 +73,11 @@ class Semaphore
 #endif
 
 #endif // S3FS_SEMAPHORE_H_
+/*
+* Local variables:
+* tab-width: 2
+* c-basic-offset: 2
+* End:
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
+*/

src/s3fs.cpp

@@ -5621,9 +5621,9 @@ int main(int argc, char* argv[])
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/s3fs.h

@@ -85,9 +85,9 @@ do{ \
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/s3fs_auth.h

@@ -53,9 +53,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/s3fs_util.cpp

@@ -1585,9 +1585,9 @@ void show_version()
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/s3fs_util.h

@@ -153,9 +153,9 @@ void show_version(void);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/sighandlers.cpp

@@ -278,9 +278,9 @@ bool S3fsSignals::WakeupUsr1Thread()
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/sighandlers.h

@@ -65,9 +65,9 @@ class S3fsSignals
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/string_util.cpp

@@ -591,9 +591,9 @@ string s3fs_wtf8_decode(const string &s)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/string_util.h

@@ -69,9 +69,9 @@ std::string s3fs_wtf8_decode(const std::string &s);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */

src/test_string_util.cpp

@@ -134,3 +134,12 @@ int main(int argc, char *argv[])
   test_wtf8_encoding();
   return 0;
 }
+
+/*
+* Local variables:
+* tab-width: 2
+* c-basic-offset: 2
+* End:
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
+*/

src/test_util.h

@@ -87,3 +87,12 @@ void assert_strequals(const char *x, const char *y, const char *file, int line)
 
 #define ASSERT_STREQUALS(x, y) \
   assert_strequals((x), (y), __FILE__, __LINE__)
+
+/*
+* Local variables:
+* tab-width: 2
+* c-basic-offset: 2
+* End:
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
+*/