diff src/macterm.h @ 83288:2c2b97b30980

Merged from [e-mail]--gnu-2005 (patch 60-65, 246-265) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-246 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-247 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-248 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-249 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-250 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-251 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-252 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-253 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-254 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-255 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-256 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-257 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-258 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-259 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-260 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-261 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-262 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-263 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-264 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-265 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-60 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-61 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-62 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-63 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-64 (mm-string-to-multibyte): Use Gnus trunk definition. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-65 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-328

--- a/src/macterm.h	Mon Apr 18 13:17:40 2005 +0000
+++ b/src/macterm.h	Mon Apr 18 13:40:23 2005 +0000
@@ -195,14 +195,14 @@
   int bitmaps_last;
 
   /* The frame (if any) which has the window that has keyboard focus.
-     Zero if none.  This is examined by Ffocus_frame in w32fns.c.  Note
+     Zero if none.  This is examined by Ffocus_frame in macfns.c.  Note
      that a mere EnterNotify event can set this; if you need to know the
      last frame specified in a FocusIn or FocusOut event, use
-     w32_focus_event_frame.  */
+     x_focus_event_frame.  */
   struct frame *x_focus_frame;
 
   /* The last frame mentioned in a FocusIn or FocusOut event.  This is
-     separate from w32_focus_frame, because whether or not LeaveNotify
+     separate from x_focus_frame, because whether or not LeaveNotify
      events cause us to lose focus depends on whether or not we have
      received a FocusIn event for it.  */
   struct frame *x_focus_event_frame;
@@ -210,7 +210,7 @@
   /* The frame which currently has the visual highlight, and should get
      keyboard input (other sorts of input have the frame encoded in the
      event).  It points to the focus frame's selected window's
-     frame.  It differs from w32_focus_frame when we're using a global
+     frame.  It differs from x_focus_frame when we're using a global
      minibuffer.  */
   struct frame *x_highlight_frame;
 
@@ -418,7 +418,7 @@
 
 #define FRAME_SIZE_HINTS(f) ((f)->output_data.mac->size_hints)
 
-/* This gives the w32_display_info structure for the display F is on.  */
+/* This gives the mac_display_info structure for the display F is on.  */
 #define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info)
 #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info)
 
@@ -624,6 +624,7 @@
 extern void mac_clear_font_name_table P_ ((void));
 #if TARGET_API_MAC_CARBON
 extern CFStringRef cfstring_create_with_utf8_cstring P_ ((const char *));
+extern CFStringRef cfstring_create_with_string P_ ((Lisp_Object));
 extern Lisp_Object cfdata_to_lisp P_ ((CFDataRef));
 extern Lisp_Object cfstring_to_lisp P_ ((CFStringRef));
 extern Lisp_Object cfnumber_to_lisp P_ ((CFNumberRef));