[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v |
Date: |
Sat, 23 Feb 2008 23:12:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/02/23 23:12:53
Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -b -r1.602 -r1.603
--- fileio.c 14 Feb 2008 19:41:43 -0000 1.602
+++ fileio.c 23 Feb 2008 23:12:52 -0000 1.603
@@ -158,6 +158,9 @@
a new file with the same mode as the original */
int auto_save_mode_bits;
+/* Set by auto_save_1 if an error occurred during the last auto-save. */
+int auto_save_error_occurred;
+
/* The symbol bound to coding-system-for-read when
insert-file-contents is called for recovering a file. This is not
an actual coding system name, but just an indicator to tell
@@ -5728,6 +5731,8 @@
char *msgbuf;
USE_SAFE_ALLOCA;
+ auto_save_error_occurred = 1;
+
ring_bell (XFRAME (selected_frame));
args[0] = build_string ("Auto-saving %s: %s");
@@ -5899,6 +5904,7 @@
make_number (minibuffer_auto_raise));
minibuffer_auto_raise = 0;
auto_saving = 1;
+ auto_save_error_occurred = 0;
/* On first pass, save all files that don't have handlers.
On second pass, save all files that do have handlers.
@@ -6013,7 +6019,8 @@
sit_for (make_number (1), 0, 0);
restore_message ();
}
- else
+ else if (!auto_save_error_occurred)
+ /* Don't overwrite the error message if an error occurred. */
/* If we displayed a message and then restored a state
with no message, leave a "done" message on the screen. */
message1 ("Auto-saving...done");
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Miles Bader, 2008/02/01
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Stefan Monnier, 2008/02/05
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Stefan Monnier, 2008/02/12
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Stefan Monnier, 2008/02/14
- [Emacs-diffs] Changes to emacs/src/fileio.c,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Miles Bader, 2008/02/24
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Stefan Monnier, 2008/02/26