From: Toshi MARUYAMA Date: Thu, 7 Mar 2013 10:29:50 +0000 (+0000) Subject: Merged r11542 from trunk to 2.3-stable. X-Git-Tag: 2.3.0~44 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e92038047f4302582577348a30bf01cc0a73488;p=redmine.git Merged r11542 from trunk to 2.3-stable. use %r{} instead of // at lib/redmine/unified_diff.rb. Syntax highlight is broken in gedit 2.28.4 on CentOS 6. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11548 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/unified_diff.rb b/lib/redmine/unified_diff.rb index 7215cb5b9..9917a554f 100644 --- a/lib/redmine/unified_diff.rb +++ b/lib/redmine/unified_diff.rb @@ -83,7 +83,7 @@ module Redmine @parsing = true end else - if line =~ /^[^\+\-\s@\\]/ + if line =~ %r{^[^\+\-\s@\\]} @parsing = false return false elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/