diff options
| author | Paul Eggert | 2016-02-03 13:21:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-02-03 13:26:52 -0800 |
| commit | 6b0ab7f5806844dc158b60a0c0c0fcc5fe5b6678 (patch) | |
| tree | 4851f964b99fc73f18ed4a6dc17e4f90ab20e1ae /src | |
| parent | 60d712bba7ef0f3a80daa1757de70856a7af9a67 (diff) | |
| download | emacs-6b0ab7f5806844dc158b60a0c0c0fcc5fe5b6678.tar.gz emacs-6b0ab7f5806844dc158b60a0c0c0fcc5fe5b6678.zip | |
Mention context when resume from emergency escape
That way, if the user has been doing something else for a while,
they are reminded of the situation when restarting Emacs,
and are more likely to understand the two questions.
* doc/emacs/trouble.texi (Emergency Escape): Document this.
* src/keyboard.c (handle_interrupt): Implement this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 64d7b139ed0..7e95ad7ad16 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -10295,6 +10295,9 @@ handle_interrupt (bool in_signal_handler) | |||
| 10295 | is used. Note that [Enter] is not echoed by dos. */ | 10295 | is used. Note that [Enter] is not echoed by dos. */ |
| 10296 | cursor_to (SELECTED_FRAME (), 0, 0); | 10296 | cursor_to (SELECTED_FRAME (), 0, 0); |
| 10297 | #endif | 10297 | #endif |
| 10298 | |||
| 10299 | write_stdout ("Emacs is resuming after an emergency escape.\n"); | ||
| 10300 | |||
| 10298 | /* It doesn't work to autosave while GC is in progress; | 10301 | /* It doesn't work to autosave while GC is in progress; |
| 10299 | the code used for auto-saving doesn't cope with the mark bit. */ | 10302 | the code used for auto-saving doesn't cope with the mark bit. */ |
| 10300 | if (!gc_in_progress) | 10303 | if (!gc_in_progress) |