Skip to content

Commit 60fc212

Browse files
committed
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.
1 parent ac41db6 commit 60fc212

7 files changed

+0
-59
lines changed

Diff for: ibase_blobs.c

-9
Original file line numberDiff line numberDiff line change
@@ -553,12 +553,3 @@ PHP_FUNCTION(ibase_blob_import)
553553
/* }}} */
554554

555555
#endif /* HAVE_IBASE */
556-
557-
/*
558-
* Local variables:
559-
* tab-width: 4
560-
* c-basic-offset: 4
561-
* End:
562-
* vim600: sw=4 ts=4 fdm=marker
563-
* vim<600: sw=4 ts=4
564-
*/

Diff for: ibase_events.c

-9
Original file line numberDiff line numberDiff line change
@@ -390,12 +390,3 @@ PHP_FUNCTION(ibase_free_event_handler)
390390
/* }}} */
391391

392392
#endif /* HAVE_IBASE */
393-
394-
/*
395-
* Local variables:
396-
* tab-width: 4
397-
* c-basic-offset: 4
398-
* End:
399-
* vim600: sw=4 ts=4 fdm=marker
400-
* vim<600: sw=4 ts=4
401-
*/

Diff for: ibase_query.c

-9
Original file line numberDiff line numberDiff line change
@@ -2085,12 +2085,3 @@ PHP_FUNCTION(ibase_param_info)
20852085
/* }}} */
20862086

20872087
#endif /* HAVE_IBASE */
2088-
2089-
/*
2090-
* Local variables:
2091-
* tab-width: 4
2092-
* c-basic-offset: 4
2093-
* End:
2094-
* vim600: sw=4 ts=4 fdm=marker
2095-
* vim<600: sw=4 ts=4
2096-
*/

Diff for: ibase_service.c

-9
Original file line numberDiff line numberDiff line change
@@ -618,12 +618,3 @@ PHP_FUNCTION(ibase_server_info)
618618
void php_ibase_register_service_constants(INIT_FUNC_ARGS) { /* nop */ }
619619

620620
#endif /* HAVE_IBASE */
621-
622-
/*
623-
* Local variables:
624-
* tab-width: 4
625-
* c-basic-offset: 4
626-
* End:
627-
* vim600: sw=4 ts=4 fdm=marker
628-
* vim<600: sw=4 ts=4
629-
*/

Diff for: interbase.c

-9
Original file line numberDiff line numberDiff line change
@@ -1463,12 +1463,3 @@ PHP_FUNCTION(ibase_gen_id)
14631463
/* }}} */
14641464

14651465
#endif /* HAVE_IBASE */
1466-
1467-
/*
1468-
* Local variables:
1469-
* tab-width: 4
1470-
* c-basic-offset: 4
1471-
* End:
1472-
* vim600: sw=4 ts=4 fdm=marker
1473-
* vim<600: sw=4 ts=4
1474-
*/

Diff for: php_ibase_includes.h

-7
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,3 @@ void php_ibase_service_minit(INIT_FUNC_ARGS);
191191
#endif
192192

193193
#endif /* PHP_IBASE_INCLUDES_H */
194-
195-
/*
196-
* Local variables:
197-
* tab-width: 4
198-
* c-basic-offset: 4
199-
* End:
200-
*/

Diff for: php_interbase.h

-7
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,3 @@ PHP_FUNCTION(ibase_free_event_handler);
9999
#define phpext_interbase_ptr NULL
100100

101101
#endif /* PHP_INTERBASE_H */
102-
103-
/*
104-
* Local variables:
105-
* tab-width: 4
106-
* c-basic-offset: 4
107-
* End:
108-
*/

0 commit comments

Comments
 (0)