Skip to content

Commit 92ac598

Browse files
petkpetk
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 020ca5b commit 92ac598

File tree

888 files changed

+111
-7004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

888 files changed

+111
-7004
lines changed

‎README.STREAMS

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

‎README.WIN32-BUILD-SYSTEM

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
The Win32 Build System.
22

33
See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
4-
5-
vim:tw=78:sw=1:ts=1:et

‎TSRM/TSRM.c

-9
Original file line numberDiff line numberDiff line change
@@ -794,12 +794,3 @@ TSRM_API const char *tsrm_api_name(void)
794794
}/*}}}*/
795795

796796
#endif /* ZTS */
797-
798-
/*
799-
* Local variables:
800-
* tab-width: 4
801-
* c-basic-offset: 4
802-
* End:
803-
* vim600: sw=4 ts=4 fdm=marker
804-
* vim<600: sw=4 ts=4
805-
*/

‎TSRM/TSRM.h

-9
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,3 @@ TSRM_API const char *tsrm_api_name(void);
210210
#endif /* ZTS */
211211

212212
#endif /* TSRM_H */
213-
214-
/*
215-
* Local variables:
216-
* tab-width: 4
217-
* c-basic-offset: 4
218-
* End:
219-
* vim600: sw=4 ts=4 fdm=marker
220-
* vim<600: sw=4 ts=4
221-
*/

‎TSRM/tsrm_config.w32.h

-9
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,3 @@
1212
#include <crtdbg.h>
1313

1414
#endif
15-
16-
/*
17-
* Local variables:
18-
* tab-width: 4
19-
* c-basic-offset: 4
20-
* End:
21-
* vim600: sw=4 ts=4 fdm=marker
22-
* vim<600: sw=4 ts=4
23-
*/

‎TSRM/tsrm_config_common.h

-9
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,3 @@ char *alloca ();
6969
#endif
7070

7171
#endif /* TSRM_CONFIG_COMMON_H */
72-
73-
/*
74-
* Local variables:
75-
* tab-width: 4
76-
* c-basic-offset: 4
77-
* End:
78-
* vim600: sw=4 ts=4 fdm=marker
79-
* vim<600: sw=4 ts=4
80-
*/

‎TSRM/tsrm_strtok_r.c

-9
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,3 @@ main()
6161
}
6262

6363
#endif
64-
65-
/*
66-
* Local variables:
67-
* tab-width: 4
68-
* c-basic-offset: 4
69-
* End:
70-
* vim600: sw=4 ts=4 fdm=marker
71-
* vim<600: sw=4 ts=4
72-
*/

‎TSRM/tsrm_win32.c

-9
Original file line numberDiff line numberDiff line change
@@ -820,12 +820,3 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
820820
/* }}} */
821821
#endif
822822
#endif
823-
824-
/*
825-
* Local variables:
826-
* tab-width: 4
827-
* c-basic-offset: 4
828-
* End:
829-
* vim600: sw=4 ts=4 fdm=marker
830-
* vim<600: sw=4 ts=4
831-
*/

‎TSRM/tsrm_win32.h

-9
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,3 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags);
109109
TSRM_API int shmdt(const void *shmaddr);
110110
TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);
111111
#endif
112-
113-
/*
114-
* Local variables:
115-
* tab-width: 4
116-
* c-basic-offset: 4
117-
* End:
118-
* vim600: sw=4 ts=4 fdm=marker
119-
* vim<600: sw=4 ts=4
120-
*/

‎Zend/zend.c

-10
Original file line numberDiff line numberDiff line change
@@ -1740,13 +1740,3 @@ ZEND_API void zend_map_ptr_extend(size_t last)
17401740
CG(map_ptr_last) = last;
17411741
}
17421742
}
1743-
1744-
/*
1745-
* Local variables:
1746-
* tab-width: 4
1747-
* c-basic-offset: 4
1748-
* indent-tabs-mode: t
1749-
* End:
1750-
* vim600: sw=4 ts=4 fdm=marker
1751-
* vim<600: sw=4 ts=4
1752-
*/

‎Zend/zend.h

-10
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,3 @@ ZEND_API void zend_restore_error_handling(zend_error_handling *saved);
354354
#include "zend_operators.h"
355355

356356
#endif /* ZEND_H */
357-
358-
/*
359-
* Local variables:
360-
* tab-width: 4
361-
* c-basic-offset: 4
362-
* indent-tabs-mode: t
363-
* End:
364-
* vim600: sw=4 ts=4 fdm=marker
365-
* vim<600: sw=4 ts=4
366-
*/

‎Zend/zend_API.c

-10
Original file line numberDiff line numberDiff line change
@@ -4407,13 +4407,3 @@ ZEND_API zend_bool zend_is_countable(zval *countable) /* {{{ */
44074407
}
44084408
}
44094409
/* }}} */
4410-
4411-
/*
4412-
* Local variables:
4413-
* tab-width: 4
4414-
* c-basic-offset: 4
4415-
* indent-tabs-mode: t
4416-
* End:
4417-
* vim600: sw=4 ts=4 fdm=marker
4418-
* vim<600: sw=4 ts=4
4419-
*/

‎Zend/zend_API.h

-11
Original file line numberDiff line numberDiff line change
@@ -1579,14 +1579,3 @@ static zend_always_inline void zend_parse_arg_zval_deref(zval *arg, zval **dest,
15791579
END_EXTERN_C()
15801580

15811581
#endif /* ZEND_API_H */
1582-
1583-
1584-
/*
1585-
* Local variables:
1586-
* tab-width: 4
1587-
* c-basic-offset: 4
1588-
* indent-tabs-mode: t
1589-
* End:
1590-
* vim600: sw=4 ts=4 fdm=marker
1591-
* vim<600: sw=4 ts=4
1592-
*/

‎Zend/zend_alloc.c

-10
Original file line numberDiff line numberDiff line change
@@ -2948,13 +2948,3 @@ ZEND_API void * __zend_realloc(void *p, size_t len)
29482948
}
29492949
zend_out_of_memory();
29502950
}
2951-
2952-
/*
2953-
* Local variables:
2954-
* tab-width: 4
2955-
* c-basic-offset: 4
2956-
* indent-tabs-mode: t
2957-
* End:
2958-
* vim600: sw=4 ts=4 fdm=marker
2959-
* vim<600: sw=4 ts=4
2960-
*/

‎Zend/zend_alloc.h

-10
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,3 @@ static void apc_init_heap(void)
401401
END_EXTERN_C()
402402

403403
#endif
404-
405-
/*
406-
* Local variables:
407-
* tab-width: 4
408-
* c-basic-offset: 4
409-
* indent-tabs-mode: t
410-
* End:
411-
* vim600: sw=4 ts=4 fdm=marker
412-
* vim<600: sw=4 ts=4
413-
*/

‎Zend/zend_alloc_sizes.h

-10
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,3 @@
6262
_(29, 3072, 4, 3, x, y)
6363

6464
#endif /* ZEND_ALLOC_SIZES_H */
65-
66-
/*
67-
* Local variables:
68-
* tab-width: 4
69-
* c-basic-offset: 4
70-
* indent-tabs-mode: t
71-
* End:
72-
* vim600: sw=4 ts=4 fdm=marker
73-
* vim<600: sw=4 ts=4
74-
*/

‎Zend/zend_arena.h

-10
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,3 @@ static zend_always_inline void zend_arena_release(zend_arena **arena_ptr, void *
111111
}
112112

113113
#endif /* _ZEND_ARENA_H_ */
114-
115-
/*
116-
* Local variables:
117-
* tab-width: 4
118-
* c-basic-offset: 4
119-
* indent-tabs-mode: t
120-
* End:
121-
* vim600: sw=4 ts=4 fdm=marker
122-
* vim<600: sw=4 ts=4
123-
*/

‎Zend/zend_ast.c

-10
Original file line numberDiff line numberDiff line change
@@ -2044,13 +2044,3 @@ ZEND_API ZEND_COLD zend_string *zend_ast_export(const char *prefix, zend_ast *as
20442044
smart_str_0(&str);
20452045
return str.s;
20462046
}
2047-
2048-
/*
2049-
* Local variables:
2050-
* tab-width: 4
2051-
* c-basic-offset: 4
2052-
* indent-tabs-mode: t
2053-
* End:
2054-
* vim600: sw=4 ts=4 fdm=marker
2055-
* vim<600: sw=4 ts=4
2056-
*/

‎Zend/zend_ast.h

-10
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,3 @@ static zend_always_inline zend_ast *zend_ast_list_rtrim(zend_ast *ast) {
335335
return ast;
336336
}
337337
#endif
338-
339-
/*
340-
* Local variables:
341-
* tab-width: 4
342-
* c-basic-offset: 4
343-
* indent-tabs-mode: t
344-
* End:
345-
* vim600: sw=4 ts=4 fdm=marker
346-
* vim<600: sw=4 ts=4
347-
*/

‎Zend/zend_bitset.h

-10
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,3 @@ static inline int zend_bitset_pop_first(zend_bitset set, uint32_t len) {
252252
}
253253

254254
#endif /* _ZEND_BITSET_H_ */
255-
256-
/*
257-
* Local variables:
258-
* tab-width: 4
259-
* c-basic-offset: 4
260-
* indent-tabs-mode: t
261-
* End:
262-
* vim600: sw=4 ts=4 fdm=marker
263-
* vim<600: sw=4 ts=4
264-
*/

‎Zend/zend_build.h

-10
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,3 @@
4444
#define ZEND_BUILD_EXTRA
4545

4646
#endif
47-
48-
/*
49-
* Local variables:
50-
* tab-width: 4
51-
* c-basic-offset: 4
52-
* indent-tabs-mode: t
53-
* End:
54-
* vim600: sw=4 ts=4 fdm=marker
55-
* vim<600: sw=4 ts=4
56-
*/

‎Zend/zend_builtin_functions.c

-10
Original file line numberDiff line numberDiff line change
@@ -2731,13 +2731,3 @@ ZEND_FUNCTION(get_extension_funcs)
27312731
}
27322732
}
27332733
/* }}} */
2734-
2735-
/*
2736-
* Local variables:
2737-
* tab-width: 4
2738-
* c-basic-offset: 4
2739-
* indent-tabs-mode: t
2740-
* End:
2741-
* vim600: sw=4 ts=4 fdm=marker
2742-
* vim<600: sw=4 ts=4
2743-
*/

‎Zend/zend_builtin_functions.h

-10
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,3 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
2727
END_EXTERN_C()
2828

2929
#endif /* ZEND_BUILTIN_FUNCTIONS_H */
30-
31-
/*
32-
* Local variables:
33-
* tab-width: 4
34-
* c-basic-offset: 4
35-
* indent-tabs-mode: t
36-
* End:
37-
* vim600: sw=4 ts=4 fdm=marker
38-
* vim<600: sw=4 ts=4
39-
*/

‎Zend/zend_closures.c

-10
Original file line numberDiff line numberDiff line change
@@ -763,13 +763,3 @@ void zend_closure_bind_var_ex(zval *closure_zv, uint32_t offset, zval *val) /* {
763763
ZVAL_COPY_VALUE(var, val);
764764
}
765765
/* }}} */
766-
767-
/*
768-
* Local variables:
769-
* tab-width: 4
770-
* c-basic-offset: 4
771-
* indent-tabs-mode: t
772-
* End:
773-
* vim600: sw=4 ts=4 fdm=marker
774-
* vim<600: sw=4 ts=4
775-
*/

‎Zend/zend_closures.h

-10
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,3 @@ ZEND_API zval* zend_get_closure_this_ptr(zval *obj);
4141
END_EXTERN_C()
4242

4343
#endif
44-
45-
/*
46-
* Local variables:
47-
* tab-width: 4
48-
* c-basic-offset: 4
49-
* indent-tabs-mode: t
50-
* End:
51-
* vim600: sw=4 ts=4 fdm=marker
52-
* vim<600: sw=4 ts=4
53-
*/

‎Zend/zend_compile.c

-10
Original file line numberDiff line numberDiff line change
@@ -8700,13 +8700,3 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
87008700
*ast_ptr = zend_ast_create_zval(&result);
87018701
}
87028702
/* }}} */
8703-
8704-
/*
8705-
* Local variables:
8706-
* tab-width: 4
8707-
* c-basic-offset: 4
8708-
* indent-tabs-mode: t
8709-
* End:
8710-
* vim600: sw=4 ts=4 fdm=marker
8711-
* vim<600: sw=4 ts=4
8712-
*/

‎Zend/zend_compile.h

-10
Original file line numberDiff line numberDiff line change
@@ -1074,13 +1074,3 @@ END_EXTERN_C()
10741074
ZEND_API zend_bool zend_binary_op_produces_numeric_string_error(uint32_t opcode, zval *op1, zval *op2);
10751075

10761076
#endif /* ZEND_COMPILE_H */
1077-
1078-
/*
1079-
* Local variables:
1080-
* tab-width: 4
1081-
* c-basic-offset: 4
1082-
* indent-tabs-mode: t
1083-
* End:
1084-
* vim600: sw=4 ts=4 fdm=marker
1085-
* vim<600: sw=4 ts=4
1086-
*/

‎Zend/zend_config.w32.h

-10
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,3 @@ extern "C++" {
8585
#define ZEND_DLIMPORT __declspec(dllimport)
8686

8787
#endif /* ZEND_CONFIG_W32_H */
88-
89-
/*
90-
* Local variables:
91-
* tab-width: 4
92-
* c-basic-offset: 4
93-
* indent-tabs-mode: t
94-
* End:
95-
* vim600: sw=4 ts=4 fdm=marker
96-
* vim<600: sw=4 ts=4
97-
*/

‎Zend/zend_constants.c

-11
Original file line numberDiff line numberDiff line change
@@ -530,14 +530,3 @@ ZEND_API int zend_register_constant(zend_constant *c)
530530
}
531531
return ret;
532532
}
533-
534-
535-
/*
536-
* Local variables:
537-
* tab-width: 4
538-
* c-basic-offset: 4
539-
* indent-tabs-mode: t
540-
* End:
541-
* vim600: sw=4 ts=4 fdm=marker
542-
* vim<600: sw=4 ts=4
543-
*/

‎Zend/zend_constants.h

-10
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,3 @@ END_EXTERN_C()
9494
#define ZEND_CONSTANT_DTOR free_zend_constant
9595

9696
#endif
97-
98-
/*
99-
* Local variables:
100-
* tab-width: 4
101-
* c-basic-offset: 4
102-
* indent-tabs-mode: t
103-
* End:
104-
* vim600: sw=4 ts=4 fdm=marker
105-
* vim<600: sw=4 ts=4
106-
*/

0 commit comments

Comments
 (0)