Mercurial > emacs
diff src/macfns.c @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 19 Sep 2005 10:20:33 +0000 |
parents | 2d92f5c9d6ae 18cc1afe504a |
children | aa89c814f853 |
line wrap: on
line diff
--- a/src/macfns.c Sun Sep 11 22:21:01 2005 +0000 +++ b/src/macfns.c Mon Sep 19 10:20:33 2005 +0000 @@ -94,6 +94,11 @@ extern Lisp_Object Vwindow_system_version; +#if GLYPH_DEBUG +int image_cache_refcount, dpyinfo_refcount; +#endif + + #if 0 /* Use xstricmp instead. */ /* compare two strings ignoring case */ @@ -4145,6 +4150,7 @@ options.optionFlags = kNavDefaultNavDlogOptions; options.optionFlags |= kNavAllFilesInPopup; /* All files allowed */ options.optionFlags |= kNavSelectAllReadableItem; + options.optionFlags &= ~kNavAllowMultipleFiles; if (!NILP(prompt)) { message = cfstring_create_with_string (prompt);