Mercurial > emacs
comparison src/fileio.c @ 89969:3219f94257bc
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-34
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-514
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-522
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 04 Sep 2004 09:14:28 +0000 |
parents | d8411455de48 c1b935408a2e |
children | cce1c0ee76ee |
comparison
equal
deleted
inserted
replaced
89968:1e9fa4848335 | 89969:3219f94257bc |
---|---|
6215 specbind (intern ("read-file-name-predicate"), | 6215 specbind (intern ("read-file-name-predicate"), |
6216 (NILP (predicate) ? Qfile_exists_p : predicate)); | 6216 (NILP (predicate) ? Qfile_exists_p : predicate)); |
6217 | 6217 |
6218 GCPRO2 (insdef, default_filename); | 6218 GCPRO2 (insdef, default_filename); |
6219 | 6219 |
6220 #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined(TARGET_API_MAC_CARBON) | 6220 #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined (TARGET_API_MAC_CARBON) |
6221 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) | 6221 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) |
6222 && use_dialog_box | 6222 && use_dialog_box |
6223 && use_file_dialog | 6223 && use_file_dialog |
6224 && have_menus_p ()) | 6224 && have_menus_p ()) |
6225 { | 6225 { |