Skip to content

Commit 341b608

Browse files
committed
Move php-flymake-php-init and reimplementation it
1 parent 095987a commit 341b608

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

php-mode.el

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
(require 'font-lock)
8181
(require 'add-log)
8282
(require 'custom)
83-
(require 'flymake)
8483
(require 'etags)
8584
(require 'speedbar)
8685
(require 'imenu)
@@ -1491,26 +1490,6 @@ a completion list."
14911490
(defvar php-font-lock-keywords php-font-lock-keywords-3
14921491
"Default expressions to highlight in PHP Mode.")
14931492

1494-
;;; Provide support for Flymake so that users can see warnings and
1495-
;;; errors in real-time as they write code.
1496-
1497-
(defun php-flymake-php-init ()
1498-
"PHP specific init-cleanup routines.
1499-
1500-
This is an alternative function of `flymake-php-init'.
1501-
Look at the `php-executable' variable instead of the constant \"php\" command."
1502-
(let* ((temp-file
1503-
(funcall
1504-
(eval-when-compile
1505-
(if (fboundp 'flymake-proc-init-create-temp-buffer-copy)
1506-
'flymake-proc-init-create-temp-buffer-copy
1507-
'flymake-init-create-temp-buffer-copy))
1508-
'flymake-create-temp-inplace))
1509-
(local-file (file-relative-name
1510-
temp-file
1511-
(file-name-directory buffer-file-name))))
1512-
(list php-executable (list "-f" local-file "-l"))))
1513-
15141493
(add-to-list 'flymake-allowed-file-name-masks
15151494
'("\\.php[345s]?\\'"
15161495
php-flymake-php-init

php.el

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
;; This file provides common variable and functions for PHP packages.
2929

3030
;;; Code:
31+
(require 'flymake)
3132

3233
;;;###autoload
3334
(defgroup php nil
@@ -173,6 +174,19 @@ can be used to match against definitions for that classlike."
173174
(when (re-search-backward re-pattern nil t)
174175
(match-string-no-properties 1))))
175176

177+
;;; Provide support for Flymake so that users can see warnings and
178+
;;; errors in real-time as they write code.
179+
(defun php-flymake-php-init ()
180+
"PHP specific init-cleanup routines.
181+
182+
This is an alternative function of `flymake-php-init'.
183+
Look at the `php-executable' variable instead of the constant \"php\" command."
184+
(let* ((init (funcall (eval-when-compile
185+
(if (fboundp 'flymake-proc-php-init)
186+
'flymake-proc-php-init
187+
'flymake-php-init)))))
188+
(list php-executable (cdr init))))
189+
176190
;;;###autoload
177191
(defun php-current-class ()
178192
"Insert current class name if cursor in class context."

0 commit comments

Comments
 (0)