File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change 9898; ; Work around emacs bug#18845, cc-mode expects cl to be loaded
9999; ; while php-mode only uses cl-lib (without compatibility aliases)
100100(eval-and-compile
101- (if (and (= emacs-major-version 24 ) (>= emacs-minor-version 4 ))
101+ (when (and (= emacs-major-version 24 ) (>= emacs-minor-version 4 ))
102102 (require 'cl )))
103103
104104; ; Work around https://github.com/emacs-php/php-mode/issues/310.
@@ -191,7 +191,7 @@ Turning this on will open it whenever `php-mode' is loaded."
191191 " Create regexp for the list of extra constant keywords KWDS."
192192 (concat " [^_$]?\\ <\\ ("
193193 (regexp-opt
194- (append kwds
194+ (append kwds
195195 (when (boundp 'web-mode-extra-php-constants ) web-mode-extra-php-constants)))
196196 " \\ )\\ >[^_]?" ))
197197
You can’t perform that action at this time.
0 commit comments