summaryrefslogtreecommitdiff
path: root/misc/ruby-mode.el
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-01-09 17:52:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-01-09 17:52:12 +0000
commitdffbc4d7f169648db7663c28d183a5e5bd16b5d6 (patch)
tree7aad50cf2bfc2f884e3e54ccd32a009b37467b7a /misc/ruby-mode.el
parent1a101d775a8c42f36c5a16978914ae2ac070e8a4 (diff)
* misc/ruby-mode.el (ruby-calculate-indent): indentation after
comment at beginning of buffer failed. * misc/ruby-mode.el (font-lock-defaults): unless XEmacs, set font-lock variables in ruby-mode-hook. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc/ruby-mode.el')
-rw-r--r--misc/ruby-mode.el22
1 files changed, 15 insertions, 7 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index a118a49..c365c20 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -543,7 +543,7 @@ The variable ruby-indent-level controls the amount of indentation.
(skip-chars-backward " \t")
(let ((pos (point)))
(while (and (re-search-backward "#" bol t)
- (= (char-before) ??))
+ (eq (char-before) ??))
(forward-char -1))
(skip-chars-backward " \t")
(and
@@ -720,12 +720,20 @@ An end of a defun is found by moving forward from the beginning of one."
("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
- (put 'ruby-mode 'font-lock-defaults
- '((ruby-font-lock-keywords)
- nil nil nil
- beginning-of-line
- (font-lock-syntactic-keywords
- . ruby-font-lock-syntactic-keywords)))
+ (cond ((featurep 'xemacs)
+ (put 'ruby-mode 'font-lock-defaults
+ '((ruby-font-lock-keywords)
+ nil nil nil
+ beginning-of-line
+ (font-lock-syntactic-keywords
+ . ruby-font-lock-syntactic-keywords))))
+ (t
+ (add-hook 'ruby-mode-hook
+ '(lambda ()
+ (make-local-variable 'font-lock-defaults)
+ (setq font-lock-defaults '((ruby-font-lock-keywords) nil nil))
+ (setq font-lock-keywords ruby-font-lock-keywords)
+ (setq font-lock-syntactic-keywords ruby-font-lock-syntactic-keywords)))))
(defun ruby-font-lock-docs (limit)
(if (re-search-forward "^=begin\\(\\s \\|$\\)" limit t)