summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-08 09:35:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-08 09:35:36 +0000
commit075e9a5555f810fe57af08ef7a064152f706aac1 (patch)
tree03bcfe01870d1571f8337eef0373b10816725064 /misc
parent718b4e9ea018afd023a9e82251954d10814c0244 (diff)
* misc/ruby-mode.el (ruby-forward-string): fixed void variable
error. * misc/ruby-mode.el (ruby-font-lock-keywords): method name can be delimited by tab. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc')
-rw-r--r--misc/ruby-mode.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 4fe33ee..fbcf869 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -132,7 +132,7 @@ Also ignores spaces after parenthesis when 'space.")
(eval-when-compile (require 'cl))
(defun ruby-imenu-create-index-in-block (prefix beg end)
- (let ((index-alist '()) (nest '()) (case-fold-search nil)
+ (let ((index-alist '()) (case-fold-search nil)
name next pos decl sing)
(goto-char beg)
(while (re-search-forward "^\\s *\\(\\(class\\>\\(\\s *<<\\)?\\|module\\>\\)\\s *\\([^\(<\n ]+\\)\\|\\(def\\|alias\\)\\>\\s *\\([^\(\n ]+\\)\\)" end t)
@@ -306,7 +306,7 @@ The variable ruby-indent-level controls the amount of indentation.
(forward-char -1))
(cond ((zerop n))
(no-error nil)
- (error "unterminated string"))))
+ ((error "unterminated string")))))
(defun ruby-parse-partial (&optional end in-string nest depth pcol indent)
(or depth (setq depth 0))
@@ -508,7 +508,7 @@ The variable ruby-indent-level controls the amount of indentation.
)))
(defun ruby-indent-size (pos nest)
- (+ pos (* (if nest nest 1) ruby-indent-level)))
+ (+ pos (* (or nest 1) ruby-indent-level)))
(defun ruby-calculate-indent (&optional parse-start)
(save-excursion
@@ -860,7 +860,7 @@ An end of a defun is found by moving forward from the beginning of one."
(defvar ruby-font-lock-keywords
(list
;; functions
- '("^\\s *def\\s +\\([^( ]+\\)"
+ '("^\\s *def\\s +\\([^( \t\n]+\\)"
1 font-lock-function-name-face)
;; keywords
(cons (concat