Fix Fortran regression with variables in nested functions

[deliverable/binutils-gdb.git] / gdb / printcmd.c

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 7529842e73b9b566b3bd9119b1d90e267089cb54..9b29b53ca74de2ae643a6e9ed56991ad809ff263 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1936,7 +1936,8 @@ do_one_display (struct display *d)
   if (d->block)
     {
       if (d->pspace == current_program_space)
-       within_current_scope = contained_in (get_selected_block (0), d->block);
+       within_current_scope = contained_in (get_selected_block (0), d->block,
+                                            true);
       else
        within_current_scope = 0;
     }
@@ -2098,7 +2099,7 @@ Num Enb Expression\n"));
       else if (d->format.format)
        printf_filtered ("/%c ", d->format.format);
       puts_filtered (d->exp_string);
-      if (d->block && !contained_in (get_selected_block (0), d->block))
+      if (d->block && !contained_in (get_selected_block (0), d->block, true))
        printf_filtered (_(" (cannot be evaluated in the current context)"));
       printf_filtered ("\n");
     }