Some more tidying and simplification pending merge.

1 files changed, 16 insertions, 59 deletions

diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty
index 7472d9a0e73..2f20ab30e4b 100644
--- a/src/ChangeLog.multi-tty
+++ b/src/ChangeLog.multi-tty
@@ -237,17 +237,11 @@
         * keyboard.c (tty_read_avail_input): Don't read from a terminal that
         is being deleted.
 
-        * term.c (get_named_tty): Abort if tty name is NULL.  Simplify
-        accordingly.
-
         * term.c (Ftty_type): Return nil if terminal is not on a tty instead
         of throwing an error.  Doc update.
 
         * term.c (init_tty): Set name before calling `get_named_tty'.
 
-        * term.c (delete_tty): Let delete_terminal delete the frames.  Plug
-        memory leak caused by tty->name.  Remove reference to `deleting_tty'.
-
         * term.c (syms_of_term) <Vsuspend_tty_functions, Vresume_tty_functions>:
         Doc update.
 
@@ -525,7 +519,6 @@
         Update declarations and macro definitions.
 
         * termchar.h (tty_display_info): Rename member `device' to `terminal'.
-        (FRAME_TTY): Update for renames.
 
         * xterm.h (x_display_info): Rename member `device' to `terminal'.
 
@@ -540,10 +533,10 @@
 
         * term.c (get_tty_device): Rename to `get_tty_terminal'.  Update.
         (Fdisplay_tty_type): Rename to `Ftty_type'.
-        (delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
-        (Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
+        (tty_set_terminal_modes, tty_reset_terminal_modes)
+        (Ftty_display_color_p, Ftty_display_color_cells)
         (Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
-        (init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
+        (init_tty, maybe_fatal, syms_of_term): Update for rename.
 
         * frame.c (Qdevice): Rename to `Qterminal'.
         (Qdisplay_live_p): Rename to `Qterminal_live_p'.
@@ -591,9 +584,6 @@
         (Fset_keyboard_coding_system_internal)
         (Fkeyboard_coding_system): Update for renames.
 
-        * data.c (Fterminal_local_value, Fset_terminal_local_value):
-        Update for renames.
-
         * minibuf.c (read_minibuf): Update for renames.
 
         * sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
@@ -649,8 +639,7 @@
 
         * callproc.c (getenv_internal): Fix get_terminal_param call.
 
-        * dispextern.h (get_device): Move declaration to termhooks.h.
-        * termhooks.h (get_device): Move here.
+        * termhooks.h (get_device): New declaration.
 
 2005-12-26  Karoly Lorentey  <lorentey@elte.hu>
 
@@ -674,8 +663,7 @@
         (set_terminal_window, cursor_to, raw_cursor_to)
         (clear_to_end, clear_frame, clear_end_of_line)
         (write_glyphs, insert_glyphs, delete_glyphs, ins_del_lines)
-        (get_device, Fdisplay_name, create_device, delete_device): Move to
-        terminal.c.
+        (Fdisplay_name, create_device, delete_device): Move to terminal.c.
         (syms_of_term): Move their initialization to terminal.c.
 
         * terminal.c: New file.
@@ -683,7 +671,7 @@
         (ring_bell, update_begin, update_end, set_terminal_window)
         (cursor_to, raw_cursor_to, clear_to_end, clear_frame)
         (clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
-        (ins_del_lines, get_device, create_device, delete_device)
+        (ins_del_lines, create_device, delete_device)
         (Fdisplay_name): Move here.
         (mark_devices, get_terminal_param, store_terminal_param)
         (Fterminal_parameters, Fterminal_parameter)
@@ -722,22 +710,20 @@
         (toggle_highligh): Rename to `tty_toggle_highlight'.
         (background_highlight): Rename to `tty_background_highlight'.
         (highlight_if_desired): Rename to `tty_highlight_if_desired'.
-
         (tty_ring_bell, tty_update_end, tty_set_terminal_window)
         (tty_set_scroll_region, tty_background_highlight)
         (tty_cursor_to, tty_raw_cursor_to, tty_clear_to_end)
         (tty_clear_frame, tty_clear_end_of_line, tty_write_glyphs)
         (tty_insert_glyphs, tty_delete_glyphs, tty_ins_del_lines)
-        (term_get_fkeys, tty_setup_colors, dissociate_if_controlling_tty)
-        (delete_tty): Add static modifier.
-
+        (term_get_fkeys, tty_setup_colors, dissociate_if_controlling_tty):
+        Add static modifier.
         (tty_reset_terminal_modes, tty_set_terminal_window)
         (tty_set_scroll_region, tty_background_highlight)
         (tty_highlight_if_desired, tty_cursor_to)
         (tty_raw_cursor_to, tty_clear_to_end, tty_clear_frame)
         (tty_clear_end_of_line, tty_write_glyphs, tty_insert_glyphs)
-        (tty_delete_glyphs, tty_ins_del_lines, turn_on_face):
-        Update for renames.
+        (tty_delete_glyphs, tty_ins_del_lines, turn_on_face): Update for
+        renames.
 
         * termhooks.h (param_alist): New member to struct device.
 
@@ -795,11 +781,6 @@
         (find_symbol_value): Use the selected frame's keyboard, not
         current_kboard.
 
-        * data.c (Fterminal_local_value, Fset_terminal_local_value): Disable
-        these functions.
-
-        * data.c (syms_of_data): Don't defsubr them.
-
 2005-10-29  Karoly Lorentey  <lorentey@elte.hu>
 
         * keyboard.c (mark_kboards): Also mark Vkeyboard_translate_table.
@@ -856,20 +837,17 @@
         * minibuf.c (read_minibuf): Use temporarily_switch_to_single_kboard
         instead of simply calling single_kboard_state.
 
-        * keyboard.c (push_device_kboard): Remove function.
-        (push_kboard): New function.
+        * keyboard.c (push_kboard): New function.
         (push_frame_kboard): Use it.
         (pop_frame_kboard): Rename to pop_kboard.
 
         * xdisp.c (display_mode_line, Fformat_mode_line): Update uses.
 
         * data.c: Include termhooks.h.
-        (Fterminal_local_value, Fset_terminal_local_value): Update.
 
         * Makefile.in (data.o, fns.o): Add termhooks.h dependency.
 
-        * keyboard.h (push_device_kboard, pop_frame_kboard): Remove
-        declarations.
+        * keyboard.h (pop_frame_kboard): Remove declaration.
         (push_kboard, pop_kboard, temporarily_switch_to_single_kboard)
         (record_single_kboard_state): New declarations.
 
@@ -953,17 +931,13 @@
         * termchar.h (struct tty_display_info): Rename `display' member to
         `device'.
 
-        * keyboard.c (push_display_kboard): Rename to push_device_kboard.
-
         * frame.c (Fmake_terminal_frame): Ditto.
         * xfns.c (Fx_create_frame): Ditto.
 
         * term.c (display_list): Rename to device_list.
         * term.c (initial_display): Rename to initial_device.
         * term.c (next_display_id): Rename to next_device_id.
-        * term.c (get_display): Rename to get_device.
         * term.c (get_tty_display): Rename to get_tty_device.
-        * term.c (get_named_tty_display): Rename to get_named_tty.
         * term.c (init_initial_display): Rename to init_initial_device.
         * term.c (delete_initial_display): Rename to delete_initial_device.
         * term.c (create_display): Rename to create_device.
@@ -1028,19 +1002,15 @@
 
 2005-06-27  Karoly Lorentey  <lorentey@elte.hu>
 
-        * data.c (Fterminal_local_value, Fset_terminal_local_value): New functions.
-        (syms_of_data): Defsubr them.
+        * data.c (Fterminal_local_value, Fset_terminal_local_value): New
+        functions (note: disabled).
+        (syms_of_data): Defsubr them (note: disabled).
 
         * keyboard.c (syms_of_keyboard): Expand docs of terminal-local
         variables to warn about their random bindings.
 
 2005-06-27  Karoly Lorentey  <lorentey@elte.hu>
 
-        * keyboard.c (push_display_kboard): New function.
-        * keyboard.h (push_display_kboard): Declare it.
-
-2005-06-27  Karoly Lorentey  <lorentey@elte.hu>
-
         * termhooks.h (display): New field: kboard.
 
         * xterm.h (x_display_info): Remove kboard field.
@@ -1062,8 +1032,7 @@
         * term.c (init_initial_display): Initialize kboard.
         * xterm.c (x_term_init): Ditto.
 
-        * term.c (delete_tty): Remove kboard deletion.
-        (delete_display): Delete kboard as well.
+        * term.c (delete_display): Delete kboard as well.
 
 2005-06-26  Karoly Lorentey  <lorentey@elte.hu>
 
@@ -1120,10 +1089,6 @@
 
 2005-05-03  Karoly Lorentey  <lorentey@elte.hu>
 
-        * term.c (get_display): Fix typo.
-
-2005-05-03  Karoly Lorentey  <lorentey@elte.hu>
-
         * termhooks.h (DISPLAY_TERMINAL_CODING, DISPLAY_KEYBOARD_CODING):
         New macros.
 
@@ -1131,14 +1096,9 @@
         (Fterminal_coding_system, Fset_keyboard_coding_system_internal)
         (Fkeyboard_coding_system): Add DISPLAY parameter.
 
-        * term.c (get_display): Add THROW parameter.
-        (get_tty_display, Fdisplay_name, Fdisplay_tty_type): Update callers.
-
         * xfns.c (check_x_display_info): Ditto.
         * frame.c (Fmake_terminal_frame): Ditto.
 
-        * dispextern.h (get_display): Update prototype.
-
 2005-04-26  Karoly Lorentey  <lorentey@elte.hu>
 
         * xdisp.c (with_echo_area_buffer, set_message, set_message_1)
@@ -1302,16 +1262,13 @@
         (next_display_id): New var.
         (tty_ring_bell): Don't do anything on suspended frames.
         (Ftty_display_color_p, Ftty_display_color_cells): Doc update.
-        (get_display): New function.
         (get_tty_display): Use it.
-        (get_named_tty_display): Ignore suspended displays.
         (Fframe_tty_name): Rename to Fdisplay_name.  Handle all kinds of
         displays.
         (Fframe_tty_type): Rename to Fdisplay_tty_type.
         (init_initial_display): Set display name.
         (term_init): Allow more displays on the same device.  Set display name.
         (Fdelete_tty): Remove.
-        (delete_tty): Don't run hooks.
         (create_display): Set display id.
         (delete_display): Free display name.
         (Fsuspend_tty): Call hook with display id.  Doc update.