Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 259-273)

   - Update from CVS
   - lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
   - Merge from gnus--rel--5.10
   - Rename "field-at-point" to "field-at-pos"
   - (comint-insert-input): Remove redundant calls to setq and goto-char

 * gnus--rel--5.10  (patch 99-100)

   - Merge from emacs--devo--0
   - Update from CVS

1 files changed, 7 insertions, 0 deletions

diff --git a/src/macgui.h b/src/macgui.h
index c09f1a8d173..690840c6c33 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -105,6 +105,13 @@ typedef unsigned long Time;
 #endif
 #endif
 
+/* Whether to use the standard Font Panel floating dialog.  */
+#ifndef USE_MAC_FONT_PANEL
+#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
+#define USE_MAC_FONT_PANEL 1
+#endif
+#endif
+
 typedef WindowPtr Window;
 typedef GWorldPtr Pixmap;