diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-01 15:18:43 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-01 15:23:19 -0800 |
| commit | 33be50037c2b4cdb002538534e9915c6bad253b7 (patch) | |
| tree | 04a387a7afb86c86c4eaea71175d6d9fd1c37047 /src/editfns.c | |
| parent | 94ad13b93c6fc099a353c8eb27c00a68ee79a952 (diff) | |
| download | emacs-33be50037c2b4cdb002538534e9915c6bad253b7.tar.gz | |
Remove immediate_quit.
The old code that sets and clears immediate_quit was
ineffective except when Emacs is running in terminal mode, and
has problematic race conditions anyway, so remove it. This
will introduce some hangs when Emacs runs in terminal mode,
and these hangs should be fixed in followup patches.
* src/keyboard.c (immediate_quit): Remove. All uses removed.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/editfns.c b/src/editfns.c index 82c6abb9987..b60543702f1 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3053,7 +3053,6 @@ determines whether case is significant or ignored. */) i2 = begp2; i1_byte = buf_charpos_to_bytepos (bp1, i1); i2_byte = buf_charpos_to_bytepos (bp2, i2); - immediate_quit = true; while (i1 < endp1 && i2 < endp2) { @@ -3092,17 +3091,13 @@ determines whether case is significant or ignored. */) c1 = char_table_translate (trt, c1); c2 = char_table_translate (trt, c2); } + if (c1 != c2) - { - immediate_quit = false; - return make_number (c1 < c2 ? -1 - chars : chars + 1); - } + return make_number (c1 < c2 ? -1 - chars : chars + 1); chars++; } - immediate_quit = false; - /* The strings match as far as they go. If one is shorter, that one is less. */ if (chars < endp1 - begp1) |