diff options
| author | Stefan Monnier | 2014-07-20 21:41:59 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-07-20 21:41:59 -0400 |
| commit | bb16bffbd20705fcfbbb17189f20b838eaf7d31e (patch) | |
| tree | d1217d69a114ea09b8d67bf34a03747174ee3c16 /src | |
| parent | 5bfcb88ced494a272045da30891cacc838276bd7 (diff) | |
| download | emacs-bb16bffbd20705fcfbbb17189f20b838eaf7d31e.tar.gz emacs-bb16bffbd20705fcfbbb17189f20b838eaf7d31e.zip | |
Indentation, punctuation, and other nitpicks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/term.c | 18 | ||||
| -rw-r--r-- | src/terminal.c | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/term.c b/src/term.c index b608ebf0da9..9081790745c 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -105,9 +105,9 @@ static _Noreturn void vfatal (const char *str, va_list ap) | |||
| 105 | 105 | ||
| 106 | #define OUTPUT1_IF(tty, a) do { if (a) emacs_tputs ((tty), a, 1, cmputc); } while (0) | 106 | #define OUTPUT1_IF(tty, a) do { if (a) emacs_tputs ((tty), a, 1, cmputc); } while (0) |
| 107 | 107 | ||
| 108 | /* Display space properties */ | 108 | /* Display space properties. */ |
| 109 | 109 | ||
| 110 | /* Chain of all tty device parameters. */ | 110 | /* Chain of all tty device parameters. */ |
| 111 | struct tty_display_info *tty_list; | 111 | struct tty_display_info *tty_list; |
| 112 | 112 | ||
| 113 | /* Meaning of bits in no_color_video. Each bit set means that the | 113 | /* Meaning of bits in no_color_video. Each bit set means that the |
| @@ -4042,10 +4042,10 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed) | |||
| 4042 | open a frame on the same terminal. */ | 4042 | open a frame on the same terminal. */ |
| 4043 | int flags = O_RDWR | O_NOCTTY | (ctty ? 0 : O_IGNORE_CTTY); | 4043 | int flags = O_RDWR | O_NOCTTY | (ctty ? 0 : O_IGNORE_CTTY); |
| 4044 | int fd = emacs_open (name, flags, 0); | 4044 | int fd = emacs_open (name, flags, 0); |
| 4045 | tty->input = tty->output = | 4045 | tty->input = tty->output |
| 4046 | ((fd < 0 || ! isatty (fd)) | 4046 | = ((fd < 0 || ! isatty (fd)) |
| 4047 | ? NULL | 4047 | ? NULL |
| 4048 | : fdopen (fd, "w+")); | 4048 | : fdopen (fd, "w+")); |
| 4049 | 4049 | ||
| 4050 | if (! tty->input) | 4050 | if (! tty->input) |
| 4051 | { | 4051 | { |
| @@ -4460,7 +4460,7 @@ fatal (const char *str, ...) | |||
| 4460 | 4460 | ||
| 4461 | 4461 | ||
| 4462 | 4462 | ||
| 4463 | /* Delete the given tty terminal, closing all frames on it. */ | 4463 | /* Delete the given tty terminal, closing all frames on it. */ |
| 4464 | 4464 | ||
| 4465 | static void | 4465 | static void |
| 4466 | delete_tty (struct terminal *terminal) | 4466 | delete_tty (struct terminal *terminal) |
| @@ -4485,7 +4485,7 @@ delete_tty (struct terminal *terminal) | |||
| 4485 | ; | 4485 | ; |
| 4486 | 4486 | ||
| 4487 | if (! p) | 4487 | if (! p) |
| 4488 | /* This should not happen. */ | 4488 | /* This should not happen. */ |
| 4489 | emacs_abort (); | 4489 | emacs_abort (); |
| 4490 | 4490 | ||
| 4491 | p->next = tty->next; | 4491 | p->next = tty->next; |
| @@ -4493,7 +4493,7 @@ delete_tty (struct terminal *terminal) | |||
| 4493 | } | 4493 | } |
| 4494 | 4494 | ||
| 4495 | /* reset_sys_modes needs a valid device, so this call needs to be | 4495 | /* reset_sys_modes needs a valid device, so this call needs to be |
| 4496 | before delete_terminal. */ | 4496 | before delete_terminal. */ |
| 4497 | reset_sys_modes (tty); | 4497 | reset_sys_modes (tty); |
| 4498 | 4498 | ||
| 4499 | delete_terminal (terminal); | 4499 | delete_terminal (terminal); |
diff --git a/src/terminal.c b/src/terminal.c index 23455262cb3..a827677a58d 100644 --- a/src/terminal.c +++ b/src/terminal.c | |||
| @@ -28,13 +28,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 28 | #include "coding.h" | 28 | #include "coding.h" |
| 29 | #include "keyboard.h" | 29 | #include "keyboard.h" |
| 30 | 30 | ||
| 31 | /* Chain of all terminals currently in use. */ | 31 | /* Chain of all terminals currently in use. */ |
| 32 | struct terminal *terminal_list; | 32 | struct terminal *terminal_list; |
| 33 | 33 | ||
| 34 | /* The first unallocated terminal id. */ | 34 | /* The first unallocated terminal id. */ |
| 35 | static int next_terminal_id; | 35 | static int next_terminal_id; |
| 36 | 36 | ||
| 37 | /* The initial terminal device, created by initial_term_init. */ | 37 | /* The initial terminal device, created by initial_term_init. */ |
| 38 | struct terminal *initial_terminal; | 38 | struct terminal *initial_terminal; |
| 39 | 39 | ||
| 40 | static Lisp_Object Qterminal_live_p; | 40 | static Lisp_Object Qterminal_live_p; |
| @@ -121,9 +121,9 @@ raw_cursor_to (struct frame *f, int row, int col) | |||
| 121 | (*FRAME_TERMINAL (f)->raw_cursor_to_hook) (f, row, col); | 121 | (*FRAME_TERMINAL (f)->raw_cursor_to_hook) (f, row, col); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | /* Erase operations */ | 124 | /* Erase operations. */ |
| 125 | 125 | ||
| 126 | /* Clear from cursor to end of frame. */ | 126 | /* Clear from cursor to end of frame. */ |
| 127 | void | 127 | void |
| 128 | clear_to_end (struct frame *f) | 128 | clear_to_end (struct frame *f) |
| 129 | { | 129 | { |
| @@ -131,7 +131,7 @@ clear_to_end (struct frame *f) | |||
| 131 | (*FRAME_TERMINAL (f)->clear_to_end_hook) (f); | 131 | (*FRAME_TERMINAL (f)->clear_to_end_hook) (f); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | /* Clear entire frame */ | 134 | /* Clear entire frame. */ |
| 135 | 135 | ||
| 136 | void | 136 | void |
| 137 | clear_frame (struct frame *f) | 137 | clear_frame (struct frame *f) |