diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | misc/ruby-style.el | 15 |
2 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Thu May 17 17:03:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * misc/ruby-style.el (ruby-style-label-indent): for yacc rules. + Thu May 17 13:30:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * parse.y (f_arg): remove typo from ripper description. diff --git a/misc/ruby-style.el b/misc/ruby-style.el index 1768789470..e0ed41fbc9 100644 --- a/misc/ruby-style.el +++ b/misc/ruby-style.el @@ -4,18 +4,25 @@ (defun ruby-style-case-indent (x) (save-excursion (goto-char (cdr x)) - (if (looking-at "\\<case\\|default\\>") - (- c-basic-offset - (% (current-column) c-basic-offset))))) + (if (looking-at "\\<case\\|default\\>") '*))) + +(defun ruby-style-label-indent (x) + (save-excursion + (goto-char (cdr x)) + (backward-up-list) + (backward-sexp 2) + (if (looking-at "\\<switch\\>") '/))) (require 'cc-styles) (c-add-style "ruby" '("bsd" (c-basic-offset . 4) + (tab-width . 8) + (indent-tabs-mode . t) (c-offsets-alist (case-label . *) - (label . *) + (label . (ruby-style-label-indent *)) (statement-case-intro . *) (statement-case-open . *) (statement-block-intro . (ruby-style-case-indent +)) |