From e558436b778c0199caaff0ce40b9a279bacf640e Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 14 Oct 2013 14:55:24 +0400 Subject: [PATCH] * xfaces.c (PT_PER_INCH): Remove unused macro. * termhooks.h (struct terminal): Remove set-but-unused member fast_clear_end_of_line. (FRAME_FAST_CLEAR_END_OF_LINE): Remove. * nsterm.m (ns_create_terminal): * term.c (init_tty): * w32term.c (w32_create_terminal): * xterm.c (x_create_terminal): Adjust users. --- src/ChangeLog | 11 +++++++++++ src/nsterm.m | 1 - src/term.c | 2 -- src/termhooks.h | 3 --- src/w32term.c | 1 - src/xfaces.c | 5 ----- src/xterm.c | 1 - 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 488313e4a1e..9432c81ffd7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2013-10-14 Dmitry Antipov + + * xfaces.c (PT_PER_INCH): Remove unused macro. + * termhooks.h (struct terminal): Remove set-but-unused + member fast_clear_end_of_line. + (FRAME_FAST_CLEAR_END_OF_LINE): Remove. + * nsterm.m (ns_create_terminal): + * term.c (init_tty): + * w32term.c (w32_create_terminal): + * xterm.c (x_create_terminal): Adjust users. + 2013-10-14 Paul Eggert * lisp.h (bool_vector_size): New function. diff --git a/src/nsterm.m b/src/nsterm.m index 6625d09b5ca..5f034a4dff3 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -4094,7 +4094,6 @@ ns_create_terminal (struct ns_display_info *dpyinfo) terminal->scroll_region_ok = 1; terminal->char_ins_del_ok = 1; terminal->line_ins_del_ok = 1; - terminal->fast_clear_end_of_line = 1; terminal->memory_below_frame = 0; return terminal; diff --git a/src/term.c b/src/term.c index b946480cd0c..7cf0795aa7d 100644 --- a/src/term.c +++ b/src/term.c @@ -4408,8 +4408,6 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ || tty->TS_pad_inserted_char || tty->TS_ins_multi_chars) && (tty->TS_del_char || tty->TS_del_multi_chars)); - terminal->fast_clear_end_of_line = tty->TS_clr_line != 0; - init_baud_rate (fileno (tty->input)); #endif /* not DOS_NT */ diff --git a/src/termhooks.h b/src/termhooks.h index 9cea0c188ec..2c819ad58e3 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -408,8 +408,6 @@ struct terminal int must_write_spaces; /* Nonzero means spaces in the text must actually be output; can't just skip over some columns to leave them blank. */ - int fast_clear_end_of_line; /* Nonzero means terminal has a `ce' string. */ - int line_ins_del_ok; /* Terminal can insert and delete lines. */ int char_ins_del_ok; /* Terminal can insert and delete chars. */ int scroll_region_ok; /* Terminal supports setting the scroll @@ -620,7 +618,6 @@ tset_selection_alist (struct terminal *t, Lisp_Object val) extern struct terminal *terminal_list; #define FRAME_MUST_WRITE_SPACES(f) ((f)->terminal->must_write_spaces) -#define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->terminal->fast_clear_end_of_line) #define FRAME_LINE_INS_DEL_OK(f) ((f)->terminal->line_ins_del_ok) #define FRAME_CHAR_INS_DEL_OK(f) ((f)->terminal->char_ins_del_ok) #define FRAME_SCROLL_REGION_OK(f) ((f)->terminal->scroll_region_ok) diff --git a/src/w32term.c b/src/w32term.c index 4587c7c0676..1073179fa34 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6255,7 +6255,6 @@ w32_create_terminal (struct w32_display_info *dpyinfo) terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ terminal->char_ins_del_ok = 1; terminal->line_ins_del_ok = 1; /* We'll just blt 'em. */ - terminal->fast_clear_end_of_line = 1; /* X does this well. */ terminal->memory_below_frame = 0; /* We don't remember what scrolls off the bottom. */ diff --git a/src/xfaces.c b/src/xfaces.c index 7e83972955c..828788b4abd 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -231,11 +231,6 @@ along with GNU Emacs. If not, see . */ #ifdef HAVE_NS #define GCGraphicsExposures 0 #endif /* HAVE_NS */ - -/* Number of pt per inch (from the TeXbook). */ - -#define PT_PER_INCH 72.27 - #endif /* HAVE_WINDOW_SYSTEM */ #include "buffer.h" diff --git a/src/xterm.c b/src/xterm.c index 3299255461f..f73c093cefc 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10512,7 +10512,6 @@ x_create_terminal (struct x_display_info *dpyinfo) terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ terminal->char_ins_del_ok = 1; terminal->line_ins_del_ok = 1; /* We'll just blt 'em. */ - terminal->fast_clear_end_of_line = 1; /* X does this well. */ terminal->memory_below_frame = 0; /* We don't remember what scrolls off the bottom. */ -- 2.39.2