[SCM] GNU shishi branch, master, updated. shishi-1-0-2-21-ge62311d

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=e62311d668e4ae44fbda25effe41cdebe3a36f38

The branch, master has been updated
       via  e62311d668e4ae44fbda25effe41cdebe3a36f38 (commit)
      from  da682dcdc23a0068107a8b098d5c532051c33124 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e62311d668e4ae44fbda25effe41cdebe3a36f38
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Sep 26 02:31:41 2013 +0200

    pmccabe2html: Update from gnulib.
    
    Our changes were accepted.  Now `cyclo-shishi.html'
    cleanly passes a test executed with Xmllint.

-----------------------------------------------------------------------

Summary of changes:
 build-aux/pmccabe2html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-aux/pmccabe2html b/build-aux/pmccabe2html
index 094c3e9..ffd0788 100644
--- a/build-aux/pmccabe2html
+++ b/build-aux/pmccabe2html
@@ -422,9 +422,9 @@ function html_fnc (nfun,
 
             while ((getline codeline < (fname nfun "_fn.txt")) > 0)
             {
-                sub(/\\</, "&lt;", codeline)
-                sub(/\\>/, "&gt;", codeline)
-                sub(/&/, "&amp;", codeline)
+                gsub(/&/, "\&amp;", codeline)  # Must come first.
+                gsub(/</, "\&lt;", codeline)
+                gsub(/>/, "\&gt;", codeline)
 
                 print codeline
             }


hooks/post-receive
-- 
GNU shishi