Merge branch 'PHP-7.4'

petk · petk · commit b167dbe3ae92 · 2019-03-23T21:11:32.000+01:00
* PHP-7.4:
  [ci skip] Remove text editor modelines
diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c
@@ -1,4 +1,4 @@
-/* -*- mode: c; c-file-style: "k&r" -*-
+/*
 
   Modified for PHP by Andrei Zmievski <andrei@ispi.net>
 
diff --git a/main/build-defs.h.in b/main/build-defs.h.in
@@ -1,4 +1,4 @@
-/*                                                                -*- C -*-
+/*
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
@@ -1,4 +1,4 @@
-/* -*- C -*-
+/*
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
diff --git a/pear/Makefile.frag b/pear/Makefile.frag
@@ -1,5 +1,3 @@
-# -*- makefile -*-
-
 peardir=$(PEAR_INSTALLDIR)
 
 # Skip all php.ini files altogether

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* -- mode: c; c-file-style: "k&r" --`
	`1`	`+/*`
`2`	`2`
`3`	`3`	`Modified for PHP by Andrei Zmievski <[email protected]>`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- makefile --`
`2`		`-`
`3`	`1`	`peardir=$(PEAR_INSTALLDIR)`
`4`	`2`
`5`	`3`	`# Skip all php.ini files altogether`