diff options
| author | Paul Eggert | 2017-02-01 15:18:44 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-02-01 15:23:19 -0800 |
| commit | b4c9f9120d8b0da0593f2fbde69b40374f56451d (patch) | |
| tree | 8f40be80730a41e83e58e0632ff539ac752eb453 /src/lisp.h | |
| parent | b01ac672be1277833964d2d53f6dd26560c70343 (diff) | |
| download | emacs-b4c9f9120d8b0da0593f2fbde69b40374f56451d.tar.gz emacs-b4c9f9120d8b0da0593f2fbde69b40374f56451d.zip | |
Fix quitting bug when buffers are frozen
Problem noted by Eli Zaretskii in:
http://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00721.html
This patch also fixes some other issues in that report.
* src/lisp.h (incr_rarely_quit): Remove.
All callers changed to use rarely_quit directly.
* src/search.c (freeze_buffer_relocation)
(thaw_buffer_relocation): New functions.
(looking_at_1, fast_looking_at, search_buffer):
Use them to fix bug when quitting when buffers are frozen.
* src/sysdep.c (emacs_intr_read): Rename from emacs_nointr_read.
All uses changed.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lisp.h b/src/lisp.h index 2d67e7edddb..1ac38164c27 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3145,14 +3145,6 @@ rarely_quit (unsigned short int count) | |||
| 3145 | if (! (count & (QUIT_COUNT_HEURISTIC - 1))) | 3145 | if (! (count & (QUIT_COUNT_HEURISTIC - 1))) |
| 3146 | maybe_quit (); | 3146 | maybe_quit (); |
| 3147 | } | 3147 | } |
| 3148 | |||
| 3149 | /* Increment *QUIT_COUNT and rarely quit. */ | ||
| 3150 | |||
| 3151 | INLINE void | ||
| 3152 | incr_rarely_quit (unsigned short int *quit_count) | ||
| 3153 | { | ||
| 3154 | rarely_quit (++*quit_count); | ||
| 3155 | } | ||
| 3156 | 3148 | ||
| 3157 | extern Lisp_Object Vascii_downcase_table; | 3149 | extern Lisp_Object Vascii_downcase_table; |
| 3158 | extern Lisp_Object Vascii_canon_table; | 3150 | extern Lisp_Object Vascii_canon_table; |