Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

1 files changed, 7 insertions, 5 deletions

diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index 67354e1b1..eee3ac803 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -2707,6 +2707,7 @@ static const char *section_list[] = {
     "3L", "Lightweight Processes Library",
     "3M", "Mathematical Library",
     "3N", "Network Functions",
+    "3p", "Perl Functions",
     "3R", "RPC Services Library",
     "3S", "Standard I/O Functions",
     "3V", "C Library Functions",
@@ -5482,16 +5483,17 @@ static char *scan_troff_mandoc(char *c, bool san, char **result)
         end++;
     }
 
-    if (end > c + 2
+    if (end >= c + 2
         && ispunct(*(end - 1))
 	&& isspace(*(end - 2)) && *(end - 2) != '\n') {
       /* Don't format lonely punctuation E.g. in "xyz ," format
        * the xyz and then append the comma removing the space.
        */
-        *(end - 2) = '\n';
-	ret = scan_troff(c, san, result);
-        *(end - 2) = *(end - 1);
-        *(end - 1) = ' ';
+        *(end - 2) = 0;
+       (void)scan_troff(c, 0, result);
+       ret = end-2;
+       *(end-2)=*(end-1);
+       *(end-1)=' ';
     }
     else {
 	ret = scan_troff(c, san, result);