diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:10:44 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:10:44 +0200 |
| commit | 261cc31af5d1d9a568d3f713ce0273bd84aa889c (patch) | |
| tree | 117729e047585f76330edc8f8fc54f905572d1d8 /perl | |
| parent | 68bae5558772c36260bbc1db363a95436d6ab991 (diff) | |
| parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) | |
Merge branch 'master' into allinone-nb
Conflicts (manually resolved):
ikiwiki_nb_admin.setup
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/Locale/Po4a/Text.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Locale/Po4a/Text.pm b/perl/Locale/Po4a/Text.pm index ee56046..32f9dec 100644 --- a/perl/Locale/Po4a/Text.pm +++ b/perl/Locale/Po4a/Text.pm @@ -247,7 +247,7 @@ sub parse { or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ms # Xapian macro or $paragraph =~ /<(?![a-z]+[:@])/ms # maybe html (tags but not wiki <URI>) or $paragraph =~ /^[^<]+>/ms # maybe html (tag with vertical space) - or $paragraph =~ /^\s*\[\[\!\S[^\]]+$/ms # macro begin + or $paragraph =~ /\[\[\!\S[^\]]+$/ms # macro begin ); } if ($end_of_paragraph) { |