diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 57670b5a1330..a88968231692 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR fortran/33957
+	* expr.c (check_inquiry): Don't call gfc_error now.
+
 2007-11-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR fortran/33739
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index c7edb4977025..22df1310df12 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1981,11 +1981,7 @@ check_inquiry (gfc_expr *e, int not_restricted)
       break;
 
   if (functions[i] == NULL)
-    {
-      gfc_error ("Inquiry function '%s' at %L is not permitted "
-		 "in an initialization expression", name, &e->where);
-      return MATCH_ERROR;
-    }
+    return MATCH_ERROR;
 
   /* At this point we have an inquiry function with a variable argument.  The
      type of the variable might be undefined, but we need it now, because the
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5da0c1d878f3..21761526653e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR fortran/33957
+	* gfortran.dg/initialization_15.f90 : New test.
+
 2007-11-16  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/34030
diff --git a/gcc/testsuite/gfortran.dg/initialization_15.f90 b/gcc/testsuite/gfortran.dg/initialization_15.f90
new file mode 100644
index 000000000000..a3eb1b9d87b7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/initialization_15.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! Test by Dominique d'Humieres (PR 33957)
+function bug(i) result(c)
+  integer, pointer :: i
+  character(len=merge(1,2, associated(i))) :: c
+  c = ""
+end function bug