Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove local variables

Author: petk

README.STREAMS

@@ -374,5 +374,3 @@ the example above, you need to use mysql_free_result on the rowset, close the
 connection and then use pefree to dispose of the struct you allocated.
 You may read the stream->persistent field to determine if your struct was
 allocated in persistent mode or not.
-
-vim:tw=78:et

README.WIN32-BUILD-SYSTEM

@@ -1,5 +1,3 @@
 The Win32 Build System.
 
 See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
-
-vim:tw=78:sw=1:ts=1:et

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
- */

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
- */

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
- */

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
- */

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
- */

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
- */

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
- */

Zend/zend.c

@@ -1740,13 +1740,3 @@ ZEND_API void zend_map_ptr_extend(size_t last)
 		CG(map_ptr_last) = last;
 	}
 }
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */