From dffbc4d7f169648db7663c28d183a5e5bd16b5d6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 9 Jan 2002 17:52:12 +0000
Subject: [PATCH] * 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
---
 ChangeLog         |  8 ++++++++
 misc/ruby-mode.el | 22 +++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2fd840bdad..a4044aa213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan  9 20:21:09 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* 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.
+
 Tue Jan  8 15:54:02 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* eval.c (rb_add_method): clear replaced method from the cache.
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index a118a49587..c365c20a3b 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)