[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/gtkutil.c,v
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/gtkutil.c,v |
Date: |
Sat, 02 Sep 2006 18:10:15 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 06/09/02 18:10:15
Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- gtkutil.c 2 Jun 2006 08:48:27 -0000 1.87
+++ gtkutil.c 2 Sep 2006 18:10:15 -0000 1.88
@@ -1327,7 +1327,11 @@
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 C-x C-f to visit files.");
+ "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.");
wmessage = gtk_label_new (message);
gtk_widget_show (wmessage);
@@ -1340,6 +1344,7 @@
Lisp_Object file;
struct gcpro gcpro1;
GCPRO1 (file);
+ char *utf8_filename;
file = build_string (default_filename);
@@ -1348,13 +1353,19 @@
if (default_filename[0] != '/')
file = Fexpand_file_name (file, Qnil);
- default_filename = SSDATA (file);
- if (Ffile_directory_p (file))
+ utf8_filename = SSDATA (ENCODE_UTF_8 (file));
+ if (! NILP (Ffile_directory_p (file)))
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin),
- default_filename);
+ utf8_filename);
else
+ {
+ char *cp = strrchr (utf8_filename, '/');
+ if (cp) ++cp;
+ else cp = utf8_filename;
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
- default_filename);
+ utf8_filename);
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filewin), cp);
+ }
UNGCPRO;
}
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v,
Jan Djärv <=
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/04
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/10
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/16
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/16
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/18
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/18
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/22
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Richard M. Stallman, 2006/09/22