summaryrefslogtreecommitdiff
path: root/TSRM
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-01-22 21:39:32 +0100
committerPeter Kokot <peterkokot@gmail.com>2019-02-03 21:03:00 +0100
commit92ac598aabd336593a47ed3959f1031674b763e6 (patch)
treeeef6b7c4fca17f69cdc9a612b67af4665abf98ed /TSRM
parent020ca5bf2b91f613f86df5e819a0419f8f3c8722 (diff)
downloadphp-git-92ac598aabd336593a47ed3959f1031674b763e6.tar.gz
Remove local variables
This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
Diffstat (limited to 'TSRM')
-rw-r--r--TSRM/TSRM.c9
-rw-r--r--TSRM/TSRM.h9
-rw-r--r--TSRM/tsrm_config.w32.h9
-rw-r--r--TSRM/tsrm_config_common.h9
-rw-r--r--TSRM/tsrm_strtok_r.c9
-rw-r--r--TSRM/tsrm_win32.c9
-rw-r--r--TSRM/tsrm_win32.h9
7 files changed, 0 insertions, 63 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 183df2c420..63ae6efc23 100644
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -794,12 +794,3 @@ TSRM_API const char *tsrm_api_name(void)
}/*}}}*/
#endif /* ZTS */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 0fa2ccb48b..061459e77d 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -210,12 +210,3 @@ TSRM_API const char *tsrm_api_name(void);
#endif /* ZTS */
#endif /* TSRM_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/TSRM/tsrm_config.w32.h b/TSRM/tsrm_config.w32.h
index ab45141179..ec5c576298 100644
--- a/TSRM/tsrm_config.w32.h
+++ b/TSRM/tsrm_config.w32.h
@@ -12,12 +12,3 @@
#include <crtdbg.h>
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h
index f70f7a5c41..64cecd912a 100644
--- a/TSRM/tsrm_config_common.h
+++ b/TSRM/tsrm_config_common.h
@@ -69,12 +69,3 @@ char *alloca ();
#endif
#endif /* TSRM_CONFIG_COMMON_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/TSRM/tsrm_strtok_r.c b/TSRM/tsrm_strtok_r.c
index cf0b0e672c..472105b43e 100644
--- a/TSRM/tsrm_strtok_r.c
+++ b/TSRM/tsrm_strtok_r.c
@@ -61,12 +61,3 @@ main()
}
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 276e5e3930..704d30e209 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -820,12 +820,3 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
/* }}} */
#endif
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h
index 23603ec84b..1ae9beaf2c 100644
--- a/TSRM/tsrm_win32.h
+++ b/TSRM/tsrm_win32.h
@@ -109,12 +109,3 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags);
TSRM_API int shmdt(const void *shmaddr);
TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */