diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | misc/ruby-style.el | 26 |
2 files changed, 23 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Oct 9 23:53:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * misc/ruby-style.el (ruby-style-c-mode): buffer may not have file + name. + Wed Oct 8 11:18:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * variable.c (autoload_delete, autoload_file): should not delete diff --git a/misc/ruby-style.el b/misc/ruby-style.el index ef05ea004a..ceb960c0a0 100644 --- a/misc/ruby-style.el +++ b/misc/ruby-style.el @@ -7,6 +7,14 @@ ;;; $Author: nobu $ ;;; created at: Thu Apr 26 13:54:01 JST 2007 ;;; +;;; sets ruby style if it seems like a source of ruby. +;;; +;;; (require 'ruby-style) +;;; (add-hook 'c-mode-hook 'ruby-style-c-mode) +;;; (add-hook 'c++-mode-hook 'ruby-style-c-mode) +;;; +;;; uses ruby style always. +;;; (setq-default c-file-style "ruby") (defconst ruby-style-revision "$Revision: 15588 $" "Ruby style revision string.") @@ -19,22 +27,24 @@ (defun ruby-style-case-indent (x) (save-excursion + (back-to-indentation) (unless (progn (backward-up-list) (back-to-indentation) - (> (point) (cdr x))) + (> (point) (cdr x))) (goto-char (cdr x)) (if (looking-at "\\<case\\|default\\>") '*)))) (defun ruby-style-label-indent (x) (save-excursion + (back-to-indentation) (unless (progn (backward-up-list) (back-to-indentation) - (>= (point) (cdr x))) + (>= (point) (cdr x))) (goto-char (cdr x)) (condition-case () - (progn - (backward-up-list) - (backward-sexp 2) - (if (looking-at "\\<switch\\>") '/)) - (error))))) + (progn + (backward-up-list) + (backward-sexp 2) + (if (looking-at "\\<switch\\>") '/)) + (error))))) (require 'cc-styles) (c-add-style @@ -54,7 +64,7 @@ (defun ruby-style-c-mode () (interactive) - (if (or (string-match "/ruby\\>" (buffer-file-name)) + (if (or (let ((name (buffer-file-name))) (and name (string-match "/ruby\\>" name))) (save-excursion (goto-char (point-min)) (let ((head (progn (forward-line 100) (point))) |