[multiple changes]

2004-02-21  Bud Davis  <bdavis@gfortran.org>

        PR fortran/20086
        * io/transfer.c (write_constant_string): accept an 'h' as
        the start of a hollerith format string.

2005-02-21  Bud Davis  <bdavis9659@comcast.net>

        PR fortran/20086
        * gfortran.dg/pr20086.f90: New test.

From-SVN: r95379

gcc/testsuite/ChangeLog

+2005-02-21  Bud Davis  <bdavis9659@comcast.net>
+
+	PR fortran/20086
+	* gfortran.dg/pr20086.f90: New test.
+
 2005-02-21  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR tree-optimization/19786

gcc/testsuite/gfortran.dg/pr20086.f90

+! { dg-do run }     
+! PR 20086 - Missing characters in output with hollerith strings
+      implicit none
+      character*80 line
+      write(line,2070)
+      if (line.ne.'  stiffness reformed for this high step')call abort
+      write(line,2090)
+      if (line.ne.'  stiffness reformed for hello hello')call abort 
+      stop
+
+ 2070  format (2x,37hstiffness reformed for this high step)
+ 2090  format (2x,34hstiffness reformed for hello hello)
+
+      end

libgfortran/ChangeLog

+2004-02-21  Bud Davis  <bdavis@gfortran.org>
+
+	PR fortran/20086
+	* io/transfer.c (write_constant_string): accept an 'h' as
+	the start of a hollerith format string.
+
 2005-02-21  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	PR libfortran/19302

libgfortran/io/transfer.c

@@ -386,7 +386,7 @@ write_constant_string (fnode * f)
   for (; length > 0; length--)
     {
       c = *p++ = *q++;
-      if (c == delimiter && c != 'H')
+      if (c == delimiter && c != 'H' && c != 'h')
 	q++;			/* Skip the doubled delimiter.  */
     }
 }