зеркало из https://github.com/github/ruby.git
* misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
a patch from Marshall T. Vandegrift <llasram at gmail.com>. [ruby-core:08804] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
e6340674d1
Коммит
f2e069ad2b
10
ChangeLog
10
ChangeLog
|
@ -1,11 +1,13 @@
|
||||||
|
Wed Sep 13 18:25:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
|
||||||
|
a patch from Marshall T. Vandegrift <llasram at gmail.com>.
|
||||||
|
[ruby-core:08804]
|
||||||
|
|
||||||
Wed Sep 13 16:43:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Wed Sep 13 16:43:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* string.c (rb_str_intern): prohibit interning tainted string.
|
* string.c (rb_str_intern): prohibit interning tainted string.
|
||||||
|
|
||||||
* string.c (rb_str_intern): allow symbols to contains nul.
|
|
||||||
|
|
||||||
* string.c (sym_inspect): symbol may contain nul.
|
|
||||||
|
|
||||||
Wed Sep 13 01:14:02 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Wed Sep 13 01:14:02 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/optparse.rb (OptionParser#getopts): works with pre-registered
|
* lib/optparse.rb (OptionParser#getopts): works with pre-registered
|
||||||
|
|
|
@ -523,7 +523,7 @@ The variable ruby-indent-level controls the amount of indentation.
|
||||||
((looking-at "<<")
|
((looking-at "<<")
|
||||||
(cond
|
(cond
|
||||||
((and (ruby-expr-beg 'heredoc)
|
((and (ruby-expr-beg 'heredoc)
|
||||||
(looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\sw+\\)"))
|
(looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)"))
|
||||||
(setq re (regexp-quote (or (match-string 4) (match-string 2))))
|
(setq re (regexp-quote (or (match-string 4) (match-string 2))))
|
||||||
(if (match-beginning 1) (setq re (concat "\\s *" re)))
|
(if (match-beginning 1) (setq re (concat "\\s *" re)))
|
||||||
(let* ((id-end (goto-char (match-end 0)))
|
(let* ((id-end (goto-char (match-end 0)))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче