Merge pull request #529 from emacs-php/move/php-flymake

Move php-flymake-php-init definition

Author: zonuexe

php-mode.el

@@ -80,7 +80,6 @@
 (require 'font-lock)
 (require 'add-log)
 (require 'custom)
-(require 'flymake)
 (require 'etags)
 (require 'speedbar)
 (require 'imenu)
@@ -1491,34 +1490,12 @@ a completion list."
 (defvar php-font-lock-keywords php-font-lock-keywords-3
   "Default expressions to highlight in PHP Mode.")
 
-;;; Provide support for Flymake so that users can see warnings and
-;;; errors in real-time as they write code.
-
-(defun php-flymake-php-init ()
-  "PHP specific init-cleanup routines.
-
-This is an alternative function of `flymake-php-init'.
-Look at the `php-executable' variable instead of the constant \"php\" command."
-  (let* ((temp-file
-          (funcall
-           (eval-when-compile
-             (if (fboundp 'flymake-proc-init-create-temp-buffer-copy)
-                 'flymake-proc-init-create-temp-buffer-copy
-               'flymake-init-create-temp-buffer-copy))
-           'flymake-create-temp-inplace))
-         (local-file (file-relative-name
-                      temp-file
-                      (file-name-directory buffer-file-name))))
-    (list php-executable (list "-f" local-file "-l"))))
-
-(add-to-list 'flymake-allowed-file-name-masks
-             '("\\.php[345s]?\\'"
-               php-flymake-php-init
-               flymake-simple-cleanup
-               flymake-get-real-file-name))
-
-(add-to-list 'flymake-err-line-patterns
-             '("\\(Parse\\|Fatal\\) error: \\(.*?\\) in \\(.*?\\) on line \\([0-9]+\\)" 3 4 nil 2))
+(add-to-list
+ (eval-when-compile
+   (if (boundp 'flymake-proc-allowed-file-name-masks)
+       'flymake-proc-allowed-file-name-masks
+     'flymake-allowed-file-name-masks))
+ '("\\.php[345s]?\\'" php-flymake-php-init))
 
 
 (defun php-send-region (start end)

php.el

@@ -28,6 +28,7 @@
 ;; This file provides common variable and functions for PHP packages.
 
 ;;; Code:
+(require 'flymake)
 
 ;;;###autoload
 (defgroup php nil
@@ -173,6 +174,19 @@ can be used to match against definitions for that classlike."
     (when (re-search-backward re-pattern nil t)
       (match-string-no-properties 1))))
 
+;;; Provide support for Flymake so that users can see warnings and
+;;; errors in real-time as they write code.
+(defun php-flymake-php-init ()
+  "PHP specific init-cleanup routines.
+
+This is an alternative function of `flymake-php-init'.
+Look at the `php-executable' variable instead of the constant \"php\" command."
+  (let* ((init (funcall (eval-when-compile
+                          (if (fboundp 'flymake-proc-php-init)
+                              'flymake-proc-php-init
+                            'flymake-php-init)))))
+    (list php-executable (cdr init))))
+
 ;;;###autoload
 (defun php-current-class ()
   "Insert current class name if cursor in class context."