From b47a99485bf9937ceb5f137916bc1fd85cc2304f Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 29 Aug 2001 06:28:51 +0000 Subject: * parse.y (yylex): ternary ? can be followed by newline. * eval.c (rb_f_require): should check static linked libraries before raising exception. * array.c (rb_ary_equal): check identiry equality first. * string.c (rb_str_equal): ditto. * struct.c (rb_struct_equal): ditto. * numeric.c (Init_Numeric): undef Integer::new. * eval.c (rb_eval): NODE_WHILE should update result for each conditional evaluation. * eval.c (rb_eval): NODE_UNTIL should return last evaluated value (or value given to break). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- misc/ruby-mode.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'misc') diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 365311e3ed..2f53e36840 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -672,19 +672,19 @@ An end of a defun is found by moving forward from the beginning of one." ;; #{ }, #$hoge, #@foo are not comments ("\\(#\\)[{$@]" 1 (1 . nil)) ;; the last $' in the string ,'...$' is not variable - ("\\(^\\|[[\\s <+(,]\\)\\('\\)[^'\n\\\\]*\\(\\\\.[^'\n\\\\]*\\)*\\$\\('\\)" + ("\\(^\\|[[\\s <+(,]\\)\\('\\)[^'\n\\\\]*\\(\\\\.[^'\n\\\\]*\\)*[\\?\\$]\\('\\)" (2 (7 . nil)) (4 (7 . nil))) ;; the last $` in the string ,`...$` is not variable - ("\\(^\\|[[\\s <+(,]\\)\\(`\\)[^`\n\\\\]*\\(\\\\.[^`\n\\\\]*\\)*\\$\\(`\\)" + ("\\(^\\|[[\\s <+(,]\\)\\(`\\)[^`\n\\\\]*\\(\\\\.[^`\n\\\\]*\\)*[\\?\\$]\\(`\\)" (2 (7 . nil)) (4 (7 . nil))) ;; the last $" in the string ,"...$" is not variable - ("\\(^\\|[[\\s <+(,]\\)\\(\"\\)[^\"\n\\\\]*\\(\\\\.[^\"\n\\\\]*\\)*\\$\\(\"\\)" + ("\\(^\\|[[\\s <+(,]\\)\\(\"\\)[^\"\n\\\\]*\\(\\\\.[^\"\n\\\\]*\\)*[\\?\\$]\\(\"\\)" (2 (7 . nil)) (4 (7 . nil))) ;; $' $" $` .... are variables - ("\\$[#\"'`$\\]" 0 (1 . nil)) + ("[\\?\\$][#\"'`]" 0 (1 . nil)) ;; regexps ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)" (4 (7 . ?/)) @@ -714,12 +714,12 @@ An end of a defun is found by moving forward from the beginning of one." (let (beg) (save-excursion (if (and (re-search-backward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t) - (string= (match-string-no-properties 1) "begin")) + (string= (match-string 1) "begin")) (progn (beginning-of-line) (setq beg (point))))) (if (and beg (and (re-search-forward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t) - (string= (match-string-no-properties 1) "end"))) + (string= (match-string 1) "end"))) (progn (set-match-data (list beg (point))) t) -- cgit v1.2.3