In perl.git, the branch blead has been updated
<https://perl5.git.perl.org/perl.git/commitdiff/032639c40ae7d62f157b23237aae655d49115a56?hp=75d3e525390a7acfd95b0fc94e41aeb4af6587d4>
- Log -----------------------------------------------------------------
commit 032639c40ae7d62f157b23237aae655d49115a56
Author: Karl Williamson <k...@cpan.org>
Date: Mon Jul 16 10:40:47 2018 -0600
perllocale: Improve pod appearance
Using Z<> instead of NBSP improves the pod spacing.
commit 17dd77cd74f0a69332c091f816162e34abff30c5
Author: Francois Perrad <francois.per...@gadz.org>
Date: Mon Jul 2 00:17:44 2018 +0200
locale.c: Fix conditional compilation
With Perl 5.28.0, there are some mismatches between blocks
and conditional compilation in the Perl__is_cur_LC_category_utf8() function.
The compilation of miniperl could fails like this:
```
locale.c: In function `Perl__is_cur_LC_category_utf8`:
locale.c:5481:1: error: expected declaration or statement at end of input
}
^
```
Signed-off-by: Francois Perrad <francois.per...@gadz.org>
-----------------------------------------------------------------------
Summary of changes:
locale.c | 5 +++--
pod/perllocale.pod | 21 ++++-----------------
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/locale.c b/locale.c
index f8f77fb3d0..f2731846ad 100644
--- a/locale.c
+++ b/locale.c
@@ -4649,11 +4649,12 @@ Perl__is_cur_LC_category_utf8(pTHX_ int category)
&& wc == (wchar_t) UNICODE_REPLACEMENT);
}
+# endif
+
restore_switched_locale(LC_CTYPE, original_ctype_locale);
goto finish_and_return;
}
-# endif
# else
/* Here, we must have a C89 compiler that doesn't have mbtowc(). Next
@@ -4885,9 +4886,9 @@ Perl__is_cur_LC_category_utf8(pTHX_ int category)
is_utf8 = TRUE;
goto finish_and_return;
}
- }
# endif
+ }
# endif
/* Other common encodings are the ISO 8859 series, which aren't UTF-8. But
diff --git a/pod/perllocale.pod b/pod/perllocale.pod
index a32f72c88e..207aea0916 100644
--- a/pod/perllocale.pod
+++ b/pod/perllocale.pod
@@ -68,17 +68,11 @@ for example the character used as the decimal point.
=item Category C<LC_MONETARY>: Formatting of monetary amounts
-=for comment
-The nbsp below makes this look better (though not great)
-
-E<160>
+Z<>
=item Category C<LC_TIME>: Date/Time formatting
-=for comment
-The nbsp below makes this look better (though not great)
-
-E<160>
+Z<>
=item Category C<LC_MESSAGES>: Error and other messages
@@ -247,10 +241,7 @@ module or writing XS code, it is important to keep in mind
that the
underlying locale may be something other than "C", even if the program
hasn't explicitly changed it.
-=for comment
-The nbsp below makes this look better (though not great)
-
-E<160>
+Z<>
=item B<Lingering effects of C<S<use locale>>>
@@ -278,11 +269,7 @@ behavior, not if the matches are done within such a scope
or not.
=back
-=for comment
-The nbsp below makes this look better (though not great)
-
-
-E<160>
+Z<>
=item B<Under C<"use locale";>>
--
Perl5 Master Repository
