diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-05-23 05:35:32 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-05-23 05:35:32 +0000 |
| commit | 6e87a54aecec13d500f90ed4a19ffebc6883794b (patch) | |
| tree | 8dad6991e36a9eb9ad560c31b6e16ea9edb2a682 /misc/ruby-mode.el | |
| parent | 730d8f1d326a62d86e41faa0482f9a3c329832cb (diff) | |
* ruby.c (proc_options): removed "-*-" support for #! line.
* io.c (rb_io_s_sysopen): new method to get a raw file
descriptor. [new]
* ext/socket/socket.c (tcp_sysaccept): new method to return an
accepted socket fd (integer). [new]
* ext/socket/socket.c (unix_sysaccept,sock_sysaccept): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc/ruby-mode.el')
| -rw-r--r-- | misc/ruby-mode.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 13571dec5f..6750035e71 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -781,9 +781,10 @@ An end of a defun is found by moving forward from the beginning of one." '(lambda () (make-local-variable 'font-lock-defaults) (make-local-variable 'font-lock-keywords) - (make-local-variable 'font-lock-syntactic-keywords) + (make-local-variable 'font-lock-syntax-table) (setq font-lock-defaults '((ruby-font-lock-keywords) nil nil)) (setq font-lock-keywords ruby-font-lock-keywords) + (setq font-lock-syntax-table ruby-font-lock-syntax-table) (setq font-lock-syntactic-keywords ruby-font-lock-syntactic-keywords))))) (defun ruby-font-lock-docs (limit) @@ -812,6 +813,11 @@ An end of a defun is found by moving forward from the beginning of one." t) nil))) + (defvar ruby-font-lock-syntax-table + (let* ((tbl (copy-syntax-table ruby-mode-syntax-table))) + (modify-syntax-entry ?_ "w" tbl) + tbl)) + (defvar ruby-font-lock-keywords (list (cons (concat @@ -855,10 +861,10 @@ An end of a defun is found by moving forward from the beginning of one." "yield" ) "\\|") - "\\)\\>\\([^_]\\|$\\)") + "\\)\\>") 2) ;; variables - '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\b\\([^_]\\|$\\)" + '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\>" 2 font-lock-variable-name-face) ;; variables '("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W" |