diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-07-11 00:05:55 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-07-11 00:05:55 +0000 |
| commit | 7e59217d2639c9913c2c76cd9d9825dabe78251a (patch) | |
| tree | d4aca783b45c0625c242482c499074a1f39fa2b8 /src/termchar.h | |
| parent | a4c6993d4a0ac128dcee76fe1e87f6cade1be410 (diff) | |
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
* src/termhooks.h (struct device): Rename to `struct device'.
Rename member `next_display' to `next_device'.
Rename member `delete_display_hook' to `delete_device_hook'.
(FRAME_DISPLAY): Rename to FRAME_DEVICE.
(DISPLAY_ACTIVE_P): Rename to DEVICE_ACTIVE_P.
(DISPLAY_TERMINAL_CODING): Rename to DEVICE_TERMINAL_CODING.
(DISPLAY_KEYBOARD_CODING): Rename to DEVICE_KEYBOARD_CODING.
* src/frame.h (stuct frame): Rename `display' member to `device'.
* src/xterm.h (x_display_info): Rename member `frame_display' to `device'.
* src/termchar.h (struct tty_display_info): Rename `display' member to `device'.
* src/keyboard.c (push_display_kboard): Rename to push_device_kboard.
* lisp/frame.el (make-frame): Rename frame parameter `display-id' to `device'.
* src/frame.c (Fmake_terminal_frame): Ditto.
* src/xfns.c (Fx_create_frame): Ditto.
* src/term.c (display_list): Rename to device_list.
* src/term.c (initial_display): Rename to initial_device.
* src/term.c (next_display_id): Rename to next_device_id.
* src/term.c (get_display): Rename to get_device.
* src/term.c (get_tty_display): Rename to get_tty_device.
* src/term.c (get_named_tty_display): Rename to get_named_tty.
* src/term.c (init_initial_display): Rename to init_initial_device.
* src/term.c (delete_initial_display): Rename to delete_initial_device.
* src/term.c (create_display): Rename to create_device.
* src/term.c (delete_display): Rename to delete_device.
* src/xfns.c (check_x_display_info): Document that the function allows
display ids as well.
* src/xterm.c (x_delete_frame_display): Rename to x_delete_device.
* src/xterm.c (x_create_frame_display): Rename to x_create_device.
* src/coding.c: Update.
* src/dispextern.h: Update.
* src/data.c: Update.
* src/dispnew.c: Update.
* src/frame.c: Update.
* src/frame.h: Update.
* src/keyboard.c: Update.
* src/keyboard.h: Update.
* src/lisp.h: Update.
* src/sysdep.c: Update.
* src/term.c: Update.
* src/xdisp.c: Update.
* src/xselect.c: Update.
* src/xterm.c: Update.
* src/prefix-args.c: Include stdlib.h for exit.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-382
Diffstat (limited to 'src/termchar.h')
| -rw-r--r-- | src/termchar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/termchar.h b/src/termchar.h index ad7104ac89..1f6580b91f 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -57,7 +57,7 @@ struct tty_display_info int reference_count; /* Number of frames that are on this display. */ - struct display *display; /* Points back to the generic display + struct device *device; /* Points back to the generic display device structure. This is sometimes handy. */ /* Info on cursor positioning. */ @@ -193,7 +193,7 @@ extern struct tty_display_info *tty_list; #define FRAME_TTY(f) \ ((f)->output_method == output_termcap \ - ? (f)->display->display_info.tty \ + ? (f)->device->display_info.tty \ : (abort(), (struct tty_display_info *) 0)) #define CURTTY() FRAME_TTY (SELECTED_FRAME()) |