diff options
| author | Miles Bader <[email protected]> | 2007-10-11 16:24:58 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-10-11 16:24:58 +0000 |
| commit | c73bd236f75b742ad4642ec94798987ae6e3e1e8 (patch) | |
| tree | ef5edc8db557fc1d25a17c379e4ae63a38b3ba5c /src/macterm.h | |
| parent | ecb21060d5c1752d41d7a742be565c59b5fcb855 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: [email protected]/emacs--unicode--0--patch-257
Diffstat (limited to 'src/macterm.h')
| -rw-r--r-- | src/macterm.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/macterm.h b/src/macterm.h index 8a85e714ab..f319adeb65 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -64,6 +64,9 @@ struct mac_display_info /* Chain of all mac_display_info structures. */ struct mac_display_info *next; + /* The generic display parameters corresponding to this X display. */ + struct terminal *terminal; + /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). The same cons cell also appears in x_display_name_list. */ Lisp_Object name_list_element; @@ -358,9 +361,6 @@ typedef struct mac_output mac_output; #define FRAME_MAC_WINDOW(f) ((f)->output_data.mac->window_desc) #define FRAME_X_WINDOW(f) ((f)->output_data.mac->window_desc) -#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel) -#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) - #define FRAME_FONT(f) ((f)->output_data.mac->font) #define FRAME_FONTSET(f) ((f)->output_data.mac->fontset) @@ -636,7 +636,6 @@ extern void x_free_frame_resources P_ ((struct frame *)); extern void x_destroy_window P_ ((struct frame *)); extern void x_wm_set_size_hint P_ ((struct frame *, long, int)); extern void x_delete_display P_ ((struct x_display_info *)); -extern void mac_initialize P_ ((void)); extern Pixmap XCreatePixmap P_ ((Display *, WindowRef, unsigned int, unsigned int, unsigned int)); extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowRef, char *, |