diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-18 16:57:44 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-18 16:57:44 +0400 |
| commit | d141d7011296265b0c2a6432bed9317614abf019 (patch) | |
| tree | effac9c22d9391c5527e5d9990b1fdbe4647e556 /src/nsterm.h | |
| parent | f0ff1cd5762b2485add7b2e5a1da52eab733a873 (diff) | |
| download | emacs-d141d7011296265b0c2a6432bed9317614abf019.tar.gz | |
Remove port-specific display name lists to avoid extra
complexity and data duplication with display info lists.
* xterm.h (x_display_name_list): Remove declaration.
* xterm.c (x_display_name_list): Remove.
(x_term_init, x_delete_display, syms_of_xterm): Adjust users.
* xfns.c (x_display_info_for_name, Fx_display_list):
Likewise. Use x_display_list where appropriate.
* w32term.h (w32_display_name_list): Remove declaration.
* w32term.c (w32_display_name_list): Remove.
(w32_initialize_display_info, x_delete_display, syms_of_w32term):
Adjust users.
* w32fns.c (x_display_info_for_name, Fx_display_list):
Likewise. Use x_display_list where appropriate.
* nsterm.h (ns_display_name_list): Remove declaration.
* nsterm.m (ns_display_name_list): Remove.
(ns_term_init, syms_of_nsterm): Adjust users.
* nsfns.m (ns_display_info_for_name, Fx_display_list):
Likewise. Use x_display_list where appropriate.
* termhooks.h (TERMINAL_FONT_CACHE): New macro.
* alloc.c (toplevel) [HAVE_WINDOW_SYSTEM]: Include TERM_HEADER.
(mark_terminals): Mark per-terminal font cache.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index a4e9519daae..71faa075f32 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -552,8 +552,7 @@ struct ns_display_info /* The generic display parameters corresponding to this NS display. */ struct terminal *terminal; - /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). - The same cons cell also appears in ns_display_name_list. */ + /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). */ Lisp_Object name_list_element; /* The number of fonts loaded. */ @@ -624,7 +623,6 @@ struct ns_display_info /* This is a chain of structures for all the NS displays currently in use. */ 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 (Lisp_Object name); struct ns_output |