diff options
| author | Dmitry Antipov | 2013-10-14 14:55:24 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-10-14 14:55:24 +0400 |
| commit | e558436b778c0199caaff0ce40b9a279bacf640e (patch) | |
| tree | 80ab2b669ca83757b324c581f1f31b196e4ba8cf /src | |
| parent | 3083cf62015294c41ca2accf3f4fa642b7687bbf (diff) | |
| download | emacs-e558436b778c0199caaff0ce40b9a279bacf640e.tar.gz emacs-e558436b778c0199caaff0ce40b9a279bacf640e.zip | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 11 | ||||
| -rw-r--r-- | src/nsterm.m | 1 | ||||
| -rw-r--r-- | src/term.c | 2 | ||||
| -rw-r--r-- | src/termhooks.h | 3 | ||||
| -rw-r--r-- | src/w32term.c | 1 | ||||
| -rw-r--r-- | src/xfaces.c | 5 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-10-14 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * xfaces.c (PT_PER_INCH): Remove unused macro. | ||
| 4 | * termhooks.h (struct terminal): Remove set-but-unused | ||
| 5 | member fast_clear_end_of_line. | ||
| 6 | (FRAME_FAST_CLEAR_END_OF_LINE): Remove. | ||
| 7 | * nsterm.m (ns_create_terminal): | ||
| 8 | * term.c (init_tty): | ||
| 9 | * w32term.c (w32_create_terminal): | ||
| 10 | * xterm.c (x_create_terminal): Adjust users. | ||
| 11 | |||
| 1 | 2013-10-14 Paul Eggert <eggert@cs.ucla.edu> | 12 | 2013-10-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 13 | ||
| 3 | * lisp.h (bool_vector_size): New function. | 14 | * 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) | |||
| 4094 | terminal->scroll_region_ok = 1; | 4094 | terminal->scroll_region_ok = 1; |
| 4095 | terminal->char_ins_del_ok = 1; | 4095 | terminal->char_ins_del_ok = 1; |
| 4096 | terminal->line_ins_del_ok = 1; | 4096 | terminal->line_ins_del_ok = 1; |
| 4097 | terminal->fast_clear_end_of_line = 1; | ||
| 4098 | terminal->memory_below_frame = 0; | 4097 | terminal->memory_below_frame = 0; |
| 4099 | 4098 | ||
| 4100 | return terminal; | 4099 | 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\ | |||
| 4408 | || tty->TS_pad_inserted_char || tty->TS_ins_multi_chars) | 4408 | || tty->TS_pad_inserted_char || tty->TS_ins_multi_chars) |
| 4409 | && (tty->TS_del_char || tty->TS_del_multi_chars)); | 4409 | && (tty->TS_del_char || tty->TS_del_multi_chars)); |
| 4410 | 4410 | ||
| 4411 | terminal->fast_clear_end_of_line = tty->TS_clr_line != 0; | ||
| 4412 | |||
| 4413 | init_baud_rate (fileno (tty->input)); | 4411 | init_baud_rate (fileno (tty->input)); |
| 4414 | 4412 | ||
| 4415 | #endif /* not DOS_NT */ | 4413 | #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 | |||
| 408 | int must_write_spaces; /* Nonzero means spaces in the text must | 408 | int must_write_spaces; /* Nonzero means spaces in the text must |
| 409 | actually be output; can't just skip over | 409 | actually be output; can't just skip over |
| 410 | some columns to leave them blank. */ | 410 | some columns to leave them blank. */ |
| 411 | int fast_clear_end_of_line; /* Nonzero means terminal has a `ce' string. */ | ||
| 412 | |||
| 413 | int line_ins_del_ok; /* Terminal can insert and delete lines. */ | 411 | int line_ins_del_ok; /* Terminal can insert and delete lines. */ |
| 414 | int char_ins_del_ok; /* Terminal can insert and delete chars. */ | 412 | int char_ins_del_ok; /* Terminal can insert and delete chars. */ |
| 415 | int scroll_region_ok; /* Terminal supports setting the scroll | 413 | int scroll_region_ok; /* Terminal supports setting the scroll |
| @@ -620,7 +618,6 @@ tset_selection_alist (struct terminal *t, Lisp_Object val) | |||
| 620 | extern struct terminal *terminal_list; | 618 | extern struct terminal *terminal_list; |
| 621 | 619 | ||
| 622 | #define FRAME_MUST_WRITE_SPACES(f) ((f)->terminal->must_write_spaces) | 620 | #define FRAME_MUST_WRITE_SPACES(f) ((f)->terminal->must_write_spaces) |
| 623 | #define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->terminal->fast_clear_end_of_line) | ||
| 624 | #define FRAME_LINE_INS_DEL_OK(f) ((f)->terminal->line_ins_del_ok) | 621 | #define FRAME_LINE_INS_DEL_OK(f) ((f)->terminal->line_ins_del_ok) |
| 625 | #define FRAME_CHAR_INS_DEL_OK(f) ((f)->terminal->char_ins_del_ok) | 622 | #define FRAME_CHAR_INS_DEL_OK(f) ((f)->terminal->char_ins_del_ok) |
| 626 | #define FRAME_SCROLL_REGION_OK(f) ((f)->terminal->scroll_region_ok) | 623 | #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) | |||
| 6255 | terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ | 6255 | terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ |
| 6256 | terminal->char_ins_del_ok = 1; | 6256 | terminal->char_ins_del_ok = 1; |
| 6257 | terminal->line_ins_del_ok = 1; /* We'll just blt 'em. */ | 6257 | terminal->line_ins_del_ok = 1; /* We'll just blt 'em. */ |
| 6258 | terminal->fast_clear_end_of_line = 1; /* X does this well. */ | ||
| 6259 | terminal->memory_below_frame = 0; /* We don't remember what scrolls | 6258 | terminal->memory_below_frame = 0; /* We don't remember what scrolls |
| 6260 | off the bottom. */ | 6259 | off the bottom. */ |
| 6261 | 6260 | ||
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 <http://www.gnu.org/licenses/>. */ | |||
| 231 | #ifdef HAVE_NS | 231 | #ifdef HAVE_NS |
| 232 | #define GCGraphicsExposures 0 | 232 | #define GCGraphicsExposures 0 |
| 233 | #endif /* HAVE_NS */ | 233 | #endif /* HAVE_NS */ |
| 234 | |||
| 235 | /* Number of pt per inch (from the TeXbook). */ | ||
| 236 | |||
| 237 | #define PT_PER_INCH 72.27 | ||
| 238 | |||
| 239 | #endif /* HAVE_WINDOW_SYSTEM */ | 234 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 240 | 235 | ||
| 241 | #include "buffer.h" | 236 | #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) | |||
| 10512 | terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ | 10512 | terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ |
| 10513 | terminal->char_ins_del_ok = 1; | 10513 | terminal->char_ins_del_ok = 1; |
| 10514 | terminal->line_ins_del_ok = 1; /* We'll just blt 'em. */ | 10514 | terminal->line_ins_del_ok = 1; /* We'll just blt 'em. */ |
| 10515 | terminal->fast_clear_end_of_line = 1; /* X does this well. */ | ||
| 10516 | terminal->memory_below_frame = 0; /* We don't remember what scrolls | 10515 | terminal->memory_below_frame = 0; /* We don't remember what scrolls |
| 10517 | off the bottom. */ | 10516 | off the bottom. */ |
| 10518 | 10517 | ||