branch: externals/phps-mode commit 73ccf467e4980b731cf662c1f73bea0165df4924 Author: Christian Johansson <christ...@cvj.se> Commit: Christian Johansson <christ...@cvj.se>
Using utf-8-unix instead of unix for PSR-12 file encoding --- phps-mode.el | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/phps-mode.el b/phps-mode.el index e68b260..83bd3b7 100644 --- a/phps-mode.el +++ b/phps-mode.el @@ -5,8 +5,8 @@ ;; Author: Christian Johansson <christ...@cvj.se> ;; Maintainer: Christian Johansson <christ...@cvj.se> ;; Created: 3 Mar 2018 -;; Modified: 5 Dec 2019 -;; Version: 0.3.21 +;; Modified: 10 Dec 2019 +;; Version: 0.3.22 ;; Keywords: tools, convenience ;; URL: https://github.com/cjohansson/emacs-phps-mode @@ -97,15 +97,14 @@ (when phps-mode-use-psr-12 ;; All PHP files MUST use the Unix LF (linefeed) line ending only. - (set-buffer-file-coding-system 'unix t t) + (set-buffer-file-coding-system 'utf-8-unix t t) ;; There MUST NOT be trailing whitespace at the end of lines. (delete-trailing-whitespace (point-min) (point-max)) (whitespace-cleanup) ;; All PHP files MUST end with a non-blank line, terminated with a single LF. - (phps-mode-add-trailing-newline) - ) + (phps-mode-add-trailing-newline)) (phps-mode-analyzer-process-changes) (phps-mode-functions-process-current-buffer) @@ -124,16 +123,14 @@ (when phps-mode-use-psr-12 ;; All PHP files MUST use the Unix LF (linefeed) line ending only. - (set-buffer-file-coding-system 'unix t t) + (set-buffer-file-coding-system 'utf-8-unix t t) ;; There MUST NOT be trailing whitespace at the end of lines. (delete-trailing-whitespace (point-min) (point-max)) (whitespace-cleanup) ;; All PHP files MUST end with a non-blank line, terminated with a single LF. - (phps-mode-add-trailing-newline) - - ) + (phps-mode-add-trailing-newline)) (indent-region (point-min) (point-max)) (setq new-buffer-contents @@ -178,14 +175,12 @@ (when phps-mode-use-psr-12 ;; All PHP files MUST use the Unix LF (linefeed) line ending only. - (set-buffer-file-coding-system 'unix t t) + (set-buffer-file-coding-system 'utf-8-unix t t) ;; TODO There MUST NOT be trailing whitespace at the end of lines. ;; All PHP files MUST end with a non-blank line, terminated with a single LF. - (setq require-final-newline t) - - ) + (setq require-final-newline t)) ;; Reset buffer-local variables (setq-local phps-mode-functions-allow-after-change t)