Mercurial > emacs
changeset 109401:f0baf5788e14
(delphi-previous-indent-of): Indent case blocks within record
declarations (i.e. variant parts) correctly.
| author | Simon South <ssouth@member.fsf.org> |
|---|---|
| date | Wed, 14 Jul 2010 23:12:37 -0400 |
| parents | c232035b5f44 |
| children | 6744f59d2606 |
| files | lisp/ChangeLog lisp/progmodes/delphi.el |
| diffstat | 2 files changed, 35 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jul 14 22:34:47 2010 -0400 +++ b/lisp/ChangeLog Wed Jul 14 23:12:37 2010 -0400 @@ -1,3 +1,8 @@ +2010-07-15 Simon South <ssouth@localhost.localdomain> + + * progmodes/delphi.el (delphi-previous-indent-of): Indent case + blocks within record declarations (i.e. variant parts) correctly. + 2010-07-15 Simon South <ssouth@member.fsf.org> * progmodes/delphi.el (delphi-token-at): Give newlines precedence
--- a/lisp/progmodes/delphi.el Wed Jul 14 22:34:47 2010 -0400 +++ b/lisp/progmodes/delphi.el Wed Jul 14 23:12:37 2010 -0400 @@ -889,7 +889,24 @@ (setq token (delphi-block-start token))) ;; Regular block start found. - ((delphi-is token-kind delphi-block-statements) (throw 'done token)) + ((delphi-is token-kind delphi-block-statements) + (throw 'done + ;; As a special case, when a "case" block appears + ;; within a record declaration (to denote a variant + ;; part), the record declaration should be considered + ;; the enclosing block. + (if (eq 'case token-kind) + (let ((enclosing-token + (delphi-block-start token + 'stop-on-class))) + (if + (eq 'record + (delphi-token-kind enclosing-token)) + (if stop-on-class + enclosing-token + (delphi-previous-token enclosing-token)) + token)) + token))) ;; A class/record start also begins a block. ((delphi-composite-type-start token last-token) @@ -1059,6 +1076,7 @@ (token-kind nil) (from-kind (delphi-token-kind from-token)) (last-colon nil) + (last-of nil) (last-token nil)) (catch 'done (while token @@ -1102,9 +1120,17 @@ ;; Ignore whitespace. ((delphi-is token-kind delphi-whitespace)) - ;; Remember any ':' we encounter, since that affects how we indent to - ;; a case statement. - ((eq 'colon token-kind) (setq last-colon token)) + ;; Remember any "of" we encounter, since that affects how we + ;; indent to a case statement within a record declaration + ;; (i.e. a variant part). + ((eq 'of token-kind) + (setq last-of token)) + + ;; Remember any ':' we encounter (until we reach an "of"), + ;; since that affects how we indent to case statements in + ;; general. + ((eq 'colon token-kind) + (unless last-of (setq last-colon token))) ;; A case statement delimits a previous statement. We indent labels ;; specially.