[Emacs-diffs] Changes to emacs/src/gtkutil.c [lexbind]

[Miles Bader]

Index: emacs/src/gtkutil.c
diff -c emacs/src/gtkutil.c:1.26.2.11 emacs/src/gtkutil.c:1.26.2.12
*** emacs/src/gtkutil.c:1.26.2.11       Thu Nov  4 13:12:30 2004
--- emacs/src/gtkutil.c Fri Nov 12 04:21:17 2004
***************
*** 1131,1137 ****
  };
  
  #ifdef HAVE_GTK_FILE_BOTH
! static int use_old_gtk_file_dialog;
  #endif
  
  
--- 1131,1137 ----
  };
  
  #ifdef HAVE_GTK_FILE_BOTH
! int use_old_gtk_file_dialog;
  #endif
  
  
***************
*** 1178,1185 ****
  
  
    if (default_filename)
!     gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
!                                    default_filename);
  
    gtk_widget_show (filewin);
  
--- 1178,1201 ----
  
  
    if (default_filename)
!     {
!       Lisp_Object file;
!       struct gcpro gcpro1;
!       GCPRO1 (file);
! 
!       /* File chooser does not understand ~/... in the file name.  It must be
!          an absolute name starting with /.  */
!       if (default_filename[0] != '/')
!         {
!           file = Fexpand_file_name (build_string (default_filename), Qnil);
!           default_filename = SDATA (file);
!         }
! 
!       gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
!                                      default_filename);
! 
!       UNGCPRO;
!     }
  
    gtk_widget_show (filewin);
  
***************
*** 3538,3551 ****
                                      "gtk-key-theme-name",
                                      "Emacs",
                                      EMACS_CLASS);
- 
- #ifdef HAVE_GTK_FILE_BOTH
-   DEFVAR_BOOL ("use-old-gtk-file-dialog", &use_old_gtk_file_dialog,
-     doc: /* *Non-nil means that the old GTK file selection dialog is used.
-             If nil the new GTK file chooser is used instead.  To turn off
-             all file dialogs set the variable `use-file-dialog'.  */);
-   use_old_gtk_file_dialog = 0;
- #endif
  }
  
  #endif /* USE_GTK */
--- 3554,3559 ----