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

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        06/09/04 14:47:52

Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- gtkutil.c   2 Sep 2006 18:10:15 -0000       1.88
+++ gtkutil.c   4 Sep 2006 14:47:52 -0000       1.89
@@ -1326,12 +1326,9 @@
   message[0] = '\0';
   if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
     strcat (message, "\nType C-l to display a file name text entry box.\n");
-  strcat (message, "\nIf you don't like this file selector, customize "
-          "use-file-dialog\nto turn it off, or type ");
-  if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
-    strcat (message, "C-x C-f to visit files.");
-  else
-    strcat (message, "C-x C-w to write files.");
+  strcat (message, "\nIf you don't like this file selector, use the "
+          "corresponding\nkey binding or customize "
+          "use-file-dialog to turn it off.");
     
   wmessage = gtk_label_new (message);
   gtk_widget_show (wmessage);
@@ -1359,13 +1356,16 @@
                                              utf8_filename);
       else
         {
+          gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
+                                         utf8_filename);
+          if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
+            {
           char *cp = strrchr (utf8_filename, '/');
           if (cp) ++cp;
           else cp = utf8_filename;
-          gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
-                                         utf8_filename);
           gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filewin), cp);
         }
+        }
 
       UNGCPRO;
     }