Skip to content

Add defvar-local php-style-delete-trailing-whitespace #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2019
Merged

Add defvar-local php-style-delete-trailing-whitespace #557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a90bbf
Add defvar-local php-style-delete-trailing-whitespace
zonuexe Aug 1, 2019
5834268
Fix to avoid (php-set-style "nil") being called
zonuexe Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion php-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ this ^ lineup"
(cons "PHP" (c-lang-const c-mode-menu php)))

(defvar-local php-mode--delayed-set-style nil)
(defvar-local php-style-delete-trailing-whitespace nil)

(defun php-set-style (stylename &optional dont-override)
"Set the current `php-mode' buffer to use the style STYLENAME.
Expand Down Expand Up @@ -1064,7 +1065,8 @@ After setting the stylevars run hooks according to STYLENAME
(when php-mode--delayed-set-style
(let ((coding-style (or (and (boundp 'php-project-coding-style) php-project-coding-style)
php-mode-coding-style)))
(prog1 (php-set-style (symbol-name coding-style))
(prog1 (when coding-style
(php-set-style (symbol-name coding-style)))
(remove-hook 'hack-local-variables-hook #'php-mode-set-style-delay)))))

(defvar php-mode-syntax-table
Expand Down