diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-27 06:05:04 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-27 06:05:04 +0000 |
commit | 51e6d9061dc8090bd1c9e3a1a8dadbbd9294a48d (patch) | |
tree | 034956384b778251a1dd4090d2f19a43a0d0025b /misc | |
parent | 8df4564367f895a5ba6f9186f7c90ebd07c874bb (diff) | |
download | bundler-51e6d9061dc8090bd1c9e3a1a8dadbbd9294a48d.tar.gz |
* misc/ruby-mode.el: better support for general delimited
strings. [ruby-dev:22695]
* lib/weakref.rb (WeakRef::initialize): set up @__id before
calling "super".
* lib/delegate.rb (Delegator::initialize): preserve
singleton_method_added method [ruby-dev:22685]
* lib/delegate.rb (Delegator::initialize): use Kernel::raise
instead of mere raise. [ruby-dev:22681]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc')
-rw-r--r-- | misc/ruby-mode.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 081218c408..106668de19 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -1013,10 +1013,6 @@ balanced expression is found." ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)" (4 (7 . ?/)) (6 (7 . ?/))) - ;; %Q!...! - ("\\(^\\|[[ \t\n<+(,=]\\)%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\2\\)" - (2 (7 . nil)) - (4 (7 . nil))) ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil)) ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil)))) @@ -1098,7 +1094,6 @@ balanced expression is found." t) nil))) - (defvar ruby-font-lock-keywords (list ;; functions @@ -1168,6 +1163,9 @@ balanced expression is found." 0 font-lock-string-face t) `(,ruby-here-doc-beg-re 0 font-lock-string-face t) + ;; general delimited string + '("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)" + (2 font-lock-string-face)) ;; constants '("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)" 2 font-lock-type-face) |