[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/php-mode 2bc4db007c 9/9: Merge pull request #719 from emac
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/php-mode 2bc4db007c 9/9: Merge pull request #719 from emacs-php/feature/always-disable-c-auto-align-backslashe |
Date: |
Sat, 5 Nov 2022 19:59:06 -0400 (EDT) |
branch: elpa/php-mode
commit 2bc4db007c4e6ccbc2d2e6e74fb54a1af0ead054
Merge: 56e5b67c06 7bcc9d64e9
Author: USAMI Kenta <tadsan@pixiv.com>
Commit: GitHub <noreply@github.com>
Merge pull request #719 from
emacs-php/feature/always-disable-c-auto-align-backslashe
Remove php-mode-disable-c-auto-align-backslashes and always disabled
---
CHANGELOG.md | 5 +++++
lisp/php-mode.el | 10 +---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4ba92416d..6b483f6000 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,10 @@ All notable changes of the PHP Mode 1.19.1 release series
are documented in this
* `(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.
* Make obsolete `php-mode-disable-c-mode-hook` customize variable ([#718])
+### Removed
+
+ * Remove `php-mode-disable-c-auto-align-backslashes` as it doesn't make sense
and is always disabled
+
### Fixed
* 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
[#716]: https://github.com/emacs-php/php-mode/pull/716
[#717]: https://github.com/emacs-php/php-mode/pull/717
[#718]: https://github.com/emacs-php/php-mode/pull/718
+[#719]: https://github.com/emacs-php/php-mode/pull/719
## [1.24.1] - 2022-10-08
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index d7603131dd..463d8495f6 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -300,12 +300,6 @@ In that case set to `NIL'."
:tag "PHP Mode Enable Backup Style Variables"
:type 'boolean)
-(defcustom php-mode-disable-c-auto-align-backslashes t
- "When set to non-NIL, override `c-auto-align-backslashes' to NIL."
- :group 'php-mode
- :tag "PHP Mode Disable c-auto-align-backslashes"
- :type 'boolean)
-
(define-obsolete-variable-alias 'php-mode-disable-parent-mode-hooks
'php-mode-disable-c-mode-hook "1.21.0")
(defcustom php-mode-disable-c-mode-hook t
"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."
php-warned-bad-indent
(php-check-html-for-indentation))
(let ((here (point))
- (c-auto-align-backslashes
- (unless php-mode-disable-c-auto-align-backslashes
- c-auto-align-backslashes))
doit)
(move-beginning-of-line nil)
;; Don't indent heredoc end mark
@@ -1202,6 +1193,7 @@ After setting the stylevars run hooks according to
STYLENAME
(c-initialize-cc-mode t)
(c-init-language-vars php-mode)
(c-common-init 'php-mode)
+ (setq-local c-auto-align-backslashes nil)
(setq-local comment-start "// ")
(setq-local comment-start-skip
- [nongnu] elpa/php-mode updated (f5c4016bb6 -> 2bc4db007c), ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode 683211c088 2/9: Remove 'flymake-cc from flymake-diagnostic-functions, ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode dc67eaecf1 3/9: Add php-flymake.el, ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode a8a62f39ed 6/9: Make append to flymake-allowed-file-name-masks only in legacy, ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode 56e5b67c06 7/9: Merge pull request #718 from emacs-php/feature/flymake-diagnostic-functions, ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode 2bc4db007c 9/9: Merge pull request #719 from emacs-php/feature/always-disable-c-auto-align-backslashe,
ELPA Syncer <=
- [nongnu] elpa/php-mode 0902894e21 4/9: Add php-mode-replace-flymake-diag-function, ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode 330070dc01 5/9: Fix php-flymake-php-init for legacy flymake, ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode 0260bd288a 1/9: Make obsolete php-mode-disable-c-mode-hook variable, ELPA Syncer, 2022/11/05
- [nongnu] elpa/php-mode 7bcc9d64e9 8/9: Remove php-mode-disable-c-auto-align-backslashes and always disabled, ELPA Syncer, 2022/11/05