diff src/nsterm.h @ 96870:30f1368d9cf6

* term/ns-win.el: Rename ns- functions/variables to the corresponding x- versions. (x-select-text, x-cut-buffer-or-selection-value) (x-disown-selection-internal, x-get-selection-internal) (x-own-selection-internal, x-defined-colors, xw-defined-colors) (x-display-mm-width, x-display-mm-height) (x-display-backing-store, x-display-save-under) (x-display-visual-class, x-display-screens, x-focus-frame): Remove defaliases. * image.c: * nsfns.m: * nsselect.m: * nsterm.h: * nsterm.m: Rename ns prefixed functions/variables to the corresponding x versions. Update references.

--- a/src/nsterm.h	Mon Jul 21 17:43:33 2008 +0000
+++ b/src/nsterm.h	Mon Jul 21 17:47:25 2008 +0000
@@ -477,8 +477,6 @@
   /* Minimum font height over all fonts in font_table.  */
   int smallest_font_height;
 
-  struct kboard *kboard;
-
   /*/23 */
   struct ns_bitmap_record *bitmaps;
   int bitmaps_size;
@@ -527,17 +525,12 @@
   int mouse_face_hidden;
   int mouse_face_image_state;
 
-  /* these are general, but we redefine due to Xism */
-  struct frame *ns_highlight_frame;
-  struct frame *ns_focus_frame;
-#define x_highlight_frame ns_highlight_frame
-#define x_focus_frame ns_focus_frame
+  struct frame *x_highlight_frame;
+  struct frame *x_focus_frame;
 };
 
 /* This is a chain of structures for all the NS displays currently in use.  */
-extern struct ns_display_info *ns_display_list;
-/* handle Xism */
-#define x_display_list ns_display_list
+extern struct ns_display_info *x_display_list;
 
 extern Lisp_Object ns_display_name_list;
 extern struct ns_display_info *ns_display_info_for_name ();