[Emacs-diffs] Changes to emacs/src/nsterm.h,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/07/21 17:47:27

Index: src/nsterm.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/nsterm.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/nsterm.h        19 Jul 2008 22:23:30 -0000      1.6
+++ src/nsterm.h        21 Jul 2008 17:47:24 -0000      1.7
@@ -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 ();