summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-20 22:27:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-20 22:27:30 +0000
commita3db038bac9f6628329617dec5f29bbe164afb46 (patch)
tree319b6546ab78383c9104e7d296d674db31da66f3
parent6e6849639123fa4c06b2de2554871d8963722aaf (diff)
downloadruby-a3db038bac9f6628329617dec5f29bbe164afb46.tar.gz
ruby-a3db038bac9f6628329617dec5f29bbe164afb46.tar.xz
ruby-a3db038bac9f6628329617dec5f29bbe164afb46.zip
* misc/ruby-mode.el (ruby-parse-partial): keywords must not be
preceded by @ or $. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--misc/ruby-mode.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d42301d8f..6182517d6 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 304c481a8..b416951b8 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