Mercurial > emacs
comparison src/fileio.c @ 83199:0e38a1bd20a8
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-509
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-510
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-511
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-512
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-513
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-514
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-515
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-516
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-517
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-518
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-239
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 31 Aug 2004 16:31:03 +0000 |
parents | b15f799f66b5 c1b935408a2e |
children | 42acc7fa8a4f |
comparison
equal
deleted
inserted
replaced
83198:d58083e7ec81 | 83199:0e38a1bd20a8 |
---|---|
6304 specbind (intern ("read-file-name-predicate"), | 6304 specbind (intern ("read-file-name-predicate"), |
6305 (NILP (predicate) ? Qfile_exists_p : predicate)); | 6305 (NILP (predicate) ? Qfile_exists_p : predicate)); |
6306 | 6306 |
6307 GCPRO2 (insdef, default_filename); | 6307 GCPRO2 (insdef, default_filename); |
6308 | 6308 |
6309 #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) | 6309 #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined (TARGET_API_MAC_CARBON) |
6310 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) | 6310 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) |
6311 && use_dialog_box | 6311 && use_dialog_box |
6312 && use_file_dialog | 6312 && use_file_dialog |
6313 && have_menus_p ()) | 6313 && have_menus_p ()) |
6314 { | 6314 { |