Skip to content

Commit 7bcc9d6

Browse files
committed
Remove php-mode-disable-c-auto-align-backslashes and always disabled
1 parent a8a62f3 commit 7bcc9d6

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
3535
* `(php-mode-version :as-number t)` is provided for use cases comparing as versions, but generally SHOULD NOT be dependent on the PHP Mode version.
3636
* Make obsolete `php-mode-disable-c-mode-hook` customize variable ([#718])
3737

38+
### Removed
39+
40+
* Remove `php-mode-disable-c-auto-align-backslashes` as it doesn't make sense and is always disabled
41+
3842
### Fixed
3943

4044
* Removed invalid definitions that caused errors in some expressions ([#704])
@@ -50,6 +54,7 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
5054
[#716]: https://github.com/emacs-php/php-mode/pull/716
5155
[#717]: https://github.com/emacs-php/php-mode/pull/717
5256
[#718]: https://github.com/emacs-php/php-mode/pull/718
57+
[#719]: https://github.com/emacs-php/php-mode/pull/719
5358

5459
## [1.24.1] - 2022-10-08
5560

lisp/php-mode.el

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,6 @@ In that case set to `NIL'."
300300
:tag "PHP Mode Enable Backup Style Variables"
301301
:type 'boolean)
302302

303-
(defcustom php-mode-disable-c-auto-align-backslashes t
304-
"When set to non-NIL, override `c-auto-align-backslashes' to NIL."
305-
:group 'php-mode
306-
:tag "PHP Mode Disable c-auto-align-backslashes"
307-
:type 'boolean)
308-
309303
(define-obsolete-variable-alias 'php-mode-disable-parent-mode-hooks 'php-mode-disable-c-mode-hook "1.21.0")
310304
(defcustom php-mode-disable-c-mode-hook t
311305
"When set to `T', do not run hooks of parent modes (`java-mode', `c-mode')."
@@ -916,9 +910,6 @@ reported, even if `c-report-syntactic-errors' is non-nil."
916910
php-warned-bad-indent
917911
(php-check-html-for-indentation))
918912
(let ((here (point))
919-
(c-auto-align-backslashes
920-
(unless php-mode-disable-c-auto-align-backslashes
921-
c-auto-align-backslashes))
922913
doit)
923914
(move-beginning-of-line nil)
924915
;; Don't indent heredoc end mark
@@ -1202,6 +1193,7 @@ After setting the stylevars run hooks according to STYLENAME
12021193
(c-initialize-cc-mode t)
12031194
(c-init-language-vars php-mode)
12041195
(c-common-init 'php-mode)
1196+
(setq-local c-auto-align-backslashes nil)
12051197

12061198
(setq-local comment-start "// ")
12071199
(setq-local comment-start-skip

0 commit comments

Comments
 (0)