Skip to content

Remove set require-final-newline variable from c-add-style clause #428

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
zonuexe merged 2 commits into from
Feb 28, 2018
Merged

Remove set require-final-newline variable from c-add-style clause #428

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f55f10
Remove set require-final-newline variable from c-add-style clause
zonuexe Feb 28, 2018
b4ad97d
Remove force set require-final-newline to nil
zonuexe Feb 28, 2018
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
11 changes: 1 addition & 10 deletions php-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,6 @@ but only if the setting is enabled"
(indent-tabs-mode . nil)
(tab-width . ,(default-value 'tab-width))
(fill-column . ,(default-value 'fill-column))
(require-final-newline . ,(default-value 'require-final-newline))
(show-trailing-whitespace . ,(default-value 'show-trailing-whitespace))
(php-style-delete-trailing-whitespace . nil)))

Expand Down Expand Up @@ -736,8 +735,7 @@ but only if the setting is enabled"
'("php"
(c-offsets-alist . ((statement-cont . php-lineup-hanging-semicolon)))
(c-indent-comments-syntactically-p . t)
(fill-column . 78)
(require-final-newline . t)))
(fill-column . 78)))

(defun php-enable-symfony2-coding-style ()
"Make php-mode use coding styles that are preferable for working with Symfony2."
Expand All @@ -750,7 +748,6 @@ but only if the setting is enabled"
(c-offsets-alist . ((statement-cont . +)))
(c-indent-comments-syntactically-p . t)
(fill-column . 78)
(require-final-newline . t)
(show-trailing-whitespace . t)
(php-style-delete-trailing-whitespace . t)))

Expand Down Expand Up @@ -1203,12 +1200,6 @@ After setting the stylevars run hooks according to STYLENAME
;; PHP vars are case-sensitive
(setq case-fold-search t)

;; Do not force newline at end of file. Such newlines can cause
;; trouble if the PHP file is included in another file before calls
;; to header() or cookie().
(set (make-local-variable 'require-final-newline) nil)
(set (make-local-variable 'next-line-add-newlines) nil)

(php-set-style (symbol-name php-mode-coding-style))

(when (or php-mode-force-pear
Expand Down