diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-26 06:00:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-26 06:00:52 +0000 |
| commit | ba2a19d9415d441398c174f97e17c3f40bc4d411 (patch) | |
| tree | 8a6d594fa57ef58d6e7c9b5603cdb5840b26ee90 /misc/ruby-style.el | |
| parent | a6b8c12e2ce38e075ba4632c8c94ead84c02bd21 (diff) | |
| download | ruby-ba2a19d9415d441398c174f97e17c3f40bc4d411.tar.gz ruby-ba2a19d9415d441398c174f97e17c3f40bc4d411.tar.xz ruby-ba2a19d9415d441398c174f97e17c3f40bc4d411.zip | |
* misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for
labels inside switch block.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc/ruby-style.el')
| -rw-r--r-- | misc/ruby-style.el | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/misc/ruby-style.el b/misc/ruby-style.el index 609c7509b..659158110 100644 --- a/misc/ruby-style.el +++ b/misc/ruby-style.el @@ -20,18 +20,22 @@ (defun ruby-style-case-indent (x) (save-excursion - (goto-char (cdr x)) - (if (looking-at "\\<case\\|default\\>") '*))) + (unless (progn (backward-up-list) (back-to-indentation) + (> (point) (cdr x))) + (goto-char (cdr x)) + (if (looking-at "\\<case\\|default\\>") '*)))) (defun ruby-style-label-indent (x) (save-excursion - (goto-char (cdr x)) - (condition-case () - (progn - (backward-up-list) - (backward-sexp 2) - (if (looking-at "\\<switch\\>") '/)) - (error)))) + (unless (progn (backward-up-list) (back-to-indentation) + (> (point) (cdr x))) + (goto-char (cdr x)) + (condition-case () + (progn + (backward-up-list) + (backward-sexp 2) + (if (looking-at "\\<switch\\>") '/)) + (error))))) (require 'cc-styles) (c-add-style |