diff --git a/ChangeLog b/ChangeLog
index d42301d8f8..6182517d69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 21 07:27:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-parse-partial): keywords must not be
+	  preceded by @ or $.
+
 Fri Dec 20 20:29:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 304c481a83..b416951b84 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -315,6 +315,8 @@ The variable ruby-indent-level controls the amount of indentation.
     (let ((pnt (point)) w re expand)
       (goto-char (match-beginning 0))
       (cond
+       ((and (memq (char-before) '(?@ ?$)) (looking-at "\\sw"))
+	(goto-char pnt))
        ((or (looking-at "\"")		;skip string
 	    (looking-at "`"))
 	(cond