Merged r1385 and r1426 to r1434 from trunk.
git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1437 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
c0db7007fa
commit
729d1176ea
16 files changed
+158
-31
No files matched your search
+2
-2
@@ -376,13 +376,13 @@ class RedCloth < String
|
||||
re =
|
||||
case rtype
|
||||
when :limit
|
||||
/(^|[>\s])
|
||||
/(^|[>\s\(])
|
||||
(#{rcq})
|
||||
(#{C})
|
||||
(?::(\S+?))?
|
||||
([^\s\-].*?[^\s\-]|\w)
|
||||
#{rcq}
|
||||
(?=[[:punct:]]|\s|$)/x
|
||||
(?=[[:punct:]]|\s|\)|$)/x
|
||||
else
|
||||
/(#{rcq})
|
||||
(#{C})
|
||||
|
||||
Reference in new issue
Block a user