[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#18158: Fix extra indent of d-mode "else static if" statements in cc-
From: |
Stefan Kangas |
Subject: |
bug#18158: Fix extra indent of d-mode "else static if" statements in cc-engine.el |
Date: |
Mon, 20 Jan 2020 22:18:05 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Hi Alan,
Could you please help review also the below patch for cc-engine.el?
Thanks in advance.
Best regards,
Stefan Kangas
Liran Zvibel <liranz@gmail.com> writes:
> Hi,
>
> I’m not subscribed to this list (or to -devel), so please reply also to my
> email when responding.
>
> Thanks,
> Liran Zvibel.
>
> ** Description:
>
> Fix extra indent of d-mode "else static if" statements
>
> The D programming language has a notion of “static if” conditionals.
> The d-mode (from https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode.git)
> requires cc-mode.
> When writing “else static if” blocks, the code block is getting indented
> twice,
> as well as all future “else static if”s that come later. This is very
> annoying.
>
> This simple fix was originally suggested here:
> http://www.prowiki.org/wiki4d/wiki.cgi?EditorSupport/EmacsDMode/ElseStaticIf
> The simple fix treats "static if" same as “if" that comes right after an
> “else".
>
> I fixed it locally in my installed emacs long time ago, but today when
> downloading
> trunk to test 24.4 I was disappointed it was not already fixed by someone
> else.
> I know many D programmers that apply this change locally to their installed
> Emacs,
> hopefully not for long.
>
> ** ChangeLog
>
> 2014-07-31 Liran Zvibel <liranz@gmail.com>
>
> * Small cc-mode change to make sure “else static if” does not get
> deeper and deeper indentation the same way that “else if” is treated
> for d-mode that requires cc-mode.
>
> ** The patch :
>
> === modified file 'lisp/progmodes/cc-engine.el'
> *** lisp/progmodes/cc-engine.el 2014-06-29 11:26:47 +0000
> --- lisp/progmodes/cc-engine.el 2014-07-31 15:22:15 +0000
> *************** comment at the start of cc-engine.el for
> *** 9053,9061 ****
> (looking-at "else\\>[^_]")
> (save-excursion
> (goto-char old-pos)
> ! (looking-at "if\\>[^_]")))
> ;; Special case to avoid deeper and deeper indentation
> ! ;; of "else if" clauses.
> )
>
> ((and (not stop-at-boi-only)
> --- 9053,9062 ----
> (looking-at "else\\>[^_]")
> (save-excursion
> (goto-char old-pos)
> ! (or (looking-at "if\\>[^_]")
> ! (looking-at "static\\>[^_]"))))
> ;; Special case to avoid deeper and deeper indentation
> ! ;; of "else if"/"static else if" clauses.
> )
>
> ((and (not stop-at-boi-only)
- bug#18158: Fix extra indent of d-mode "else static if" statements in cc-engine.el,
Stefan Kangas <=