diff options
| author | Andreas Schwab | 2014-07-26 13:58:24 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2014-07-26 13:58:24 +0200 |
| commit | 3acf58eec890249179b6f992c59f9adcf05b8ca8 (patch) | |
| tree | 330419ff2ccea3f5aea9d49bd0e5aba8b1d386b2 /src/process.c | |
| parent | a072c708aaa91e61fa148b1a69884a40a5d8f9fb (diff) | |
| download | emacs-3acf58eec890249179b6f992c59f9adcf05b8ca8.tar.gz emacs-3acf58eec890249179b6f992c59f9adcf05b8ca8.zip | |
Reorder conditions that are written backwards
* alloc.c (xnmalloc, xnrealloc, xpalloc, make_save_value)
(Fgarbage_collect): Reorder conditions that are written backwards.
* data.c (cons_to_unsigned): Likewise.
* dispnew.c (update_frame_1, sit_for): Likewise.
* fileio.c (file_offset): Likewise.
* filelock.c (read_lock_data, lock_file): Likewise.
* fns.c (larger_vector, make_hash_table, Fmake_hash_table):
Likewise.
* font.c (font_intern_prop, font_style_symbolic): Likewise.
* lisp.h (FIXNUM_OVERFLOW_P): Likewise.
* lread.c (read1): Likewise.
* minibuf.c (read_minibuf_noninteractive): Likewise.
* nsterm.m (x_set_frame_alpha): Likewise.
* process.c (wait_reading_process_output): Likewise.
* region-cache.c (delete_cache_boundaries): Likewise.
* xterm.c (x_set_frame_alpha): Likewise.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index 4449493a2b6..ab30698b9e8 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4303,7 +4303,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4303 | time_limit = 0; | 4303 | time_limit = 0; |
| 4304 | nsecs = -1; | 4304 | nsecs = -1; |
| 4305 | } | 4305 | } |
| 4306 | else if (TYPE_MAXIMUM (time_t) < time_limit) | 4306 | else if (time_limit > TYPE_MAXIMUM (time_t)) |
| 4307 | time_limit = TYPE_MAXIMUM (time_t); | 4307 | time_limit = TYPE_MAXIMUM (time_t); |
| 4308 | 4308 | ||
| 4309 | /* Since we may need to wait several times, | 4309 | /* Since we may need to wait several times, |
| @@ -4580,7 +4580,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4580 | continue; | 4580 | continue; |
| 4581 | FD_CLR (channel, &Available); | 4581 | FD_CLR (channel, &Available); |
| 4582 | XPROCESS (proc)->read_output_skip = 0; | 4582 | XPROCESS (proc)->read_output_skip = 0; |
| 4583 | if (XPROCESS (proc)->read_output_delay < nsecs) | 4583 | if (nsecs > XPROCESS (proc)->read_output_delay) |
| 4584 | nsecs = XPROCESS (proc)->read_output_delay; | 4584 | nsecs = XPROCESS (proc)->read_output_delay; |
| 4585 | } | 4585 | } |
| 4586 | } | 4586 | } |
| @@ -4696,7 +4696,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4696 | if (timers_run != old_timers_run | 4696 | if (timers_run != old_timers_run |
| 4697 | && waiting_for_user_input_p == -1 | 4697 | && waiting_for_user_input_p == -1 |
| 4698 | && (old_buffer != current_buffer | 4698 | && (old_buffer != current_buffer |
| 4699 | || !EQ (old_window, selected_window))) | 4699 | || !EQ (old_window, selected_window))) |
| 4700 | record_asynch_buffer_change (); | 4700 | record_asynch_buffer_change (); |
| 4701 | 4701 | ||
| 4702 | if (leave) | 4702 | if (leave) |