From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sun, 18 Sep 2005 05:42:12 +0000 (+0000)
Subject: (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]: New variables.
X-Git-Tag: emacs-pretest-22.0.90~7048
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3da64ce8fc7efe6c8ae5b135a3d5215176662df6;p=emacs.git

(image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]: New variables.
[TARGET_API_MAC_CARBON] (Fx_file_dialog): Don't allow multiple file
selection.
---

diff --git a/src/macfns.c b/src/macfns.c
index 160eb1f7774..3c92499701b 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -94,6 +94,11 @@ Lisp_Object Qcancel_timer;
 
 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 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
     options.optionFlags = kNavDefaultNavDlogOptions;
     options.optionFlags |= kNavAllFilesInPopup;  /* All files allowed */
     options.optionFlags |= kNavSelectAllReadableItem;
+    options.optionFlags &= ~kNavAllowMultipleFiles;
     if (!NILP(prompt))
       {
 	message = cfstring_create_with_string (prompt);