diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 17:48:37 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 17:48:37 +0000 |
| commit | 9e50ff0c16ca4de1c68373021ed25de09852b6c5 (patch) | |
| tree | c9b0a8a360128e65c0d6e3e925f3f721d16205e8 /src/nsterm.h | |
| parent | 5f2aebc0e64aaf57a71af694a224ea6368555c24 (diff) | |
| download | emacs-9e50ff0c16ca4de1c68373021ed25de09852b6c5.tar.gz | |
* 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.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index ace45249468..bb8beac378c 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -477,8 +477,6 @@ struct ns_display_info /* 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 @@ struct ns_display_info 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 (); |