Merge pull request #674 from emacs-php/remove-interpreter-mode-alist-for-old-emacsen

Remove interpreter-mode-alist for old Emacsen and micro optimization in compile time

Author: zonuexe

lisp/php-mode.el

@@ -56,9 +56,9 @@
 (require 'php)
 (require 'php-face)
 (require 'cc-mode)
-(require 'cc-langs)
 
 (eval-when-compile
+  (require 'cc-langs)
   (require 'cc-fonts))
 
 ;; Boilerplate from other `cc-mode' derived modes. See
@@ -73,12 +73,12 @@
 (require 'imenu)
 (require 'package)
 (require 'nadvice)
-
-(require 'cl-lib)
 (require 'mode-local)
 (require 'php-project)
 
 (eval-when-compile
+  (require 'rx)
+  (require 'cl-lib)
   (require 'regexp-opt)
   (defvar add-log-current-defun-header-regexp)
   (defvar add-log-current-defun-function)
@@ -169,12 +169,9 @@ enabled."
   :type 'boolean)
 
 ;;;###autoload
-(if (version< emacs-version "24.4")
-    (dolist (i '("php" "php5" "php7"))
-      (add-to-list 'interpreter-mode-alist (cons i 'php-mode)))
-  (add-to-list 'interpreter-mode-alist
-               ;; Match php, php-3, php5, php7, php5.5, php-7.0.1, etc.
-               (cons "php\\(?:-?[3457]\\(?:\\.[0-9]+\\)*\\)?" 'php-mode)))
+(add-to-list 'interpreter-mode-alist
+             ;; Match php, php-3, php5, php7, php5.5, php-7.0.1, etc.
+             (cons "php\\(?:-?[34578]\\(?:\\.[0-9]+\\)*\\)?" 'php-mode))
 
 (defcustom php-mode-hook nil
   "List of functions to be executed on entry to `php-mode'."

lisp/php-project.el

@@ -66,7 +66,8 @@
 ;;
 
 ;;; Code:
-(require 'cl-lib)
+(eval-when-compile
+  (require 'cl-lib))
 (require 'projectile nil t)
 
 ;; Constants

lisp/php.el

@@ -27,7 +27,8 @@
 ;; This file provides common variable and functions for PHP packages.
 
 ;;; Code:
-(require 'cl-lib)
+(eval-when-compile
+  (require 'cl-lib))
 (require 'flymake)
 (require 'php-project)
 (require 'rx)

tests/php-mode-test.el

@@ -568,15 +568,13 @@ style from Drupal."
 
 (ert-deftest php-mode-test-issue-357 ()
   "Match version-specific interpreters."
-  (dolist (on (if (version< emacs-version "24.4")
-                  '("php" "php5" "php7")
-                '("php" "php3" "php5" "php7" "php-5" "php-5.5" "php7.0.1")))
+  (dolist (on '("php" "php3" "php5" "php7" "php-5" "php-5.5" "php7.0.1"))
     (with-temp-buffer
       (insert "#!" on)
       (set-auto-mode)
       (should (eq 'php-mode major-mode))))
 
-  (dolist (off '("php2" "xphp5" "foo" "php8" "php7x"))
+  (dolist (off '("php2" "xphp5" "foo" "php7x"))
     (with-temp-buffer
       (insert "#!" off)
       (set-auto-mode)