Mercurial > emacs
comparison src/fileio.c @ 94145:3af508d0bd74
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1112
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 18 Apr 2008 02:56:45 +0000 |
parents | b9c54321b685 df2738e4f7ad |
children | 47134e6f8c9b |
comparison
equal
deleted
inserted
replaced
94144:40901fec25aa | 94145:3af508d0bd74 |
---|---|
6053 give time to read ours. */ | 6053 give time to read ours. */ |
6054 sit_for (make_number (1), 0, 0); | 6054 sit_for (make_number (1), 0, 0); |
6055 restore_message (); | 6055 restore_message (); |
6056 } | 6056 } |
6057 else if (!auto_save_error_occurred) | 6057 else if (!auto_save_error_occurred) |
6058 /* Don't overwrite the error message if an error occurred. */ | 6058 /* Don't overwrite the error message if an error occurred. |
6059 /* If we displayed a message and then restored a state | 6059 If we displayed a message and then restored a state |
6060 with no message, leave a "done" message on the screen. */ | 6060 with no message, leave a "done" message on the screen. */ |
6061 message1 ("Auto-saving...done"); | 6061 message1 ("Auto-saving...done"); |
6062 } | 6062 } |
6063 | 6063 |
6064 Vquit_flag = oquit; | 6064 Vquit_flag = oquit; |