Mercurial > emacs
changeset 69065:4c87a7783f95
* xfns.c (Fx_file_dialog, Motif and GTK): DECODE_FILE before
returning it.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 21 Feb 2006 08:37:33 +0000 |
| parents | 7f6655da13ce |
| children | 0bef3c03596b |
| files | src/ChangeLog src/xfns.c |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Feb 21 08:34:23 2006 +0000 +++ b/src/ChangeLog Tue Feb 21 08:37:33 2006 +0000 @@ -1,3 +1,8 @@ +2006-02-21 Zhang Wei <brep@newsmth.org> + + * xfns.c (Fx_file_dialog, Motif and GTK): DECODE_FILE before + returning it. + 2006-02-21 Giorgos Keramidas <keramida@ceid.upatras.gr> * fringe.c (horizontal_bar_bits): Rename from `horisontal_bar_bits'.
--- a/src/xfns.c Tue Feb 21 08:34:23 2006 +0000 +++ b/src/xfns.c Tue Feb 21 08:37:33 2006 +0000 @@ -5329,6 +5329,7 @@ int result; struct frame *f = SELECTED_FRAME (); Lisp_Object file = Qnil; + Lisp_Object decoded_file; Widget dialog, text, help; Arg al[10]; int ac = 0; @@ -5469,7 +5470,9 @@ if (NILP (file)) Fsignal (Qquit, Qnil); - return unbind_to (count, file); + decoded_file = DECODE_FILE (file); + + return unbind_to (count, decoded_file); } #endif /* USE_MOTIF */ @@ -5497,6 +5500,7 @@ FRAME_PTR f = SELECTED_FRAME (); char *fn; Lisp_Object file = Qnil; + Lisp_Object decoded_file; int count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; char *cdef_file; @@ -5537,7 +5541,9 @@ if (NILP (file)) Fsignal (Qquit, Qnil); - return unbind_to (count, file); + decoded_file = DECODE_FILE (file); + + return unbind_to (count, decoded_file); } #endif /* USE_GTK */