Mercurial > emacs
changeset 109400:c232035b5f44
(delphi-token-at): Give newlines precedence over literal tokens when
parsing so newlines aren't "absorbed" by single-line comments.
Corrects the indentation of case blocks that have a comment on the
first line.
| author | Simon South <ssouth@member.fsf.org> |
|---|---|
| date | Wed, 14 Jul 2010 22:34:47 -0400 |
| parents | 3fcc8637a887 |
| children | f0baf5788e14 |
| files | lisp/ChangeLog lisp/progmodes/delphi.el |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jul 14 15:09:28 2010 -0400 +++ b/lisp/ChangeLog Wed Jul 14 22:34:47 2010 -0400 @@ -1,3 +1,10 @@ +2010-07-15 Simon South <ssouth@member.fsf.org> + + * progmodes/delphi.el (delphi-token-at): Give newlines precedence + over literal tokens when parsing so newlines aren't "absorbed" by + single-line comments. Corrects the indentation of case blocks + that have a comment on the first line. + 2010-07-14 Karl Fogel <kfogel@red-bean.com> * bookmark.el (bookmark-load-hook): Fix doc string as suggested
--- a/lisp/progmodes/delphi.el Wed Jul 14 15:09:28 2010 -0400 +++ b/lisp/progmodes/delphi.el Wed Jul 14 22:34:47 2010 -0400 @@ -628,7 +628,9 @@ (defun delphi-token-at (p) ;; Returns the token from parsing text at point p. (when (and (<= (point-min) p) (<= p (point-max))) - (cond ((delphi-literal-token-at p)) + (cond ((delphi-char-token-at p ?\n 'newline)) + + ((delphi-literal-token-at p)) ((delphi-space-token-at p)) @@ -638,7 +640,6 @@ ((delphi-char-token-at p ?\) 'close-group)) ((delphi-char-token-at p ?\[ 'open-group)) ((delphi-char-token-at p ?\] 'close-group)) - ((delphi-char-token-at p ?\n 'newline)) ((delphi-char-token-at p ?\; 'semicolon)) ((delphi-char-token-at p ?. 'dot)) ((delphi-char-token-at p ?, 'comma))