Skip to content

Commit

Permalink
Remove local variables
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
petk committed Feb 3, 2019
1 parent ac41db6 commit 60fc212
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 59 deletions.
9 changes: 0 additions & 9 deletions ibase_blobs.c
Original file line number Diff line number Diff line change
Expand Up @@ -553,12 +553,3 @@ PHP_FUNCTION(ibase_blob_import)
/* }}} */

#endif /* HAVE_IBASE */

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
9 changes: 0 additions & 9 deletions ibase_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,3 @@ PHP_FUNCTION(ibase_free_event_handler)
/* }}} */

#endif /* HAVE_IBASE */

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
9 changes: 0 additions & 9 deletions ibase_query.c
Original file line number Diff line number Diff line change
Expand Up @@ -2085,12 +2085,3 @@ PHP_FUNCTION(ibase_param_info)
/* }}} */

#endif /* HAVE_IBASE */

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
9 changes: 0 additions & 9 deletions ibase_service.c
Original file line number Diff line number Diff line change
Expand Up @@ -618,12 +618,3 @@ PHP_FUNCTION(ibase_server_info)
void php_ibase_register_service_constants(INIT_FUNC_ARGS) { /* nop */ }

#endif /* HAVE_IBASE */

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
9 changes: 0 additions & 9 deletions interbase.c
Original file line number Diff line number Diff line change
Expand Up @@ -1463,12 +1463,3 @@ PHP_FUNCTION(ibase_gen_id)
/* }}} */

#endif /* HAVE_IBASE */

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
7 changes: 0 additions & 7 deletions php_ibase_includes.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,3 @@ void php_ibase_service_minit(INIT_FUNC_ARGS);
#endif

#endif /* PHP_IBASE_INCLUDES_H */

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
*/
7 changes: 0 additions & 7 deletions php_interbase.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,3 @@ PHP_FUNCTION(ibase_free_event_handler);
#define phpext_interbase_ptr NULL

#endif /* PHP_INTERBASE_H */

/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
*/

0 comments on commit 60fc212

Please sign in to comment.