From a8f4bdc694f9a0b19f48bb6b55d3722386714b89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 21 Feb 2006 08:37:33 +0000 Subject: [PATCH] * xfns.c (Fx_file_dialog, Motif and GTK): DECODE_FILE before returning it. --- src/ChangeLog | 5 +++++ src/xfns.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d4439ac1f91..4e91240b34d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-02-21 Zhang Wei + + * xfns.c (Fx_file_dialog, Motif and GTK): DECODE_FILE before + returning it. + 2006-02-21 Giorgos Keramidas * fringe.c (horizontal_bar_bits): Rename from `horisontal_bar_bits'. diff --git a/src/xfns.c b/src/xfns.c index e2449a8f3c0..9f221efb5de 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5329,6 +5329,7 @@ or directory must exist. ONLY-DIR-P is ignored." */) 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 @@ or directory must exist. ONLY-DIR-P is ignored." */) 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 @@ directories. */) 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 @@ directories. */) 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 */ -- 2.39.2