From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 4 Dec 2000 15:54:41 +0000 (+0000)
Subject: (auto_save_error): Add parameter ERROR.  Show the
X-Git-Tag: emacs-pretest-21.0.93~242
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7f31e224bfa16fddde4288a8e31fd0f8001935d;p=emacs.git

(auto_save_error): Add parameter ERROR.  Show the
error in the message.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e484ffed576..ece9b428aa1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-04  Gerd Moellmann  <gerd@gnu.org>
 
+	* fileio.c (auto_save_error): Add parameter ERROR.  Show the
+	error in the message.
+
 	* keyboard.c (Fread_key_sequence): Don't start the busy cursor
 	timer after having read a key.  It's not good for code reading
 	several keys in a loop, like an input method.
diff --git a/src/fileio.c b/src/fileio.c
index 0eb07ce3bc1..92a4842391c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5224,15 +5224,32 @@ An argument specifies the modification time value to use\n\
 }
 
 Lisp_Object
-auto_save_error ()
+auto_save_error (error)
+     Lisp_Object error;
 {
+  Lisp_Object args[3], msg;
+  int i, nbytes;
+  struct gcpro gcpro1;
+  
   ring_bell ();
-  message_with_string ("Autosaving...error for %s", current_buffer->name, 1);
-  Fsleep_for (make_number (1), Qnil);
-  message_with_string ("Autosaving...error for %s", current_buffer->name, 0);
-  Fsleep_for (make_number (1), Qnil);
-  message_with_string ("Autosaving...error for %s", current_buffer->name, 0);
-  Fsleep_for (make_number (1), Qnil);
+  
+  args[0] = build_string ("Auto-saving %s: %s");
+  args[1] = current_buffer->name;
+  args[2] = Ferror_message_string (error);
+  msg = Fformat (3, args);
+  GCPRO1 (msg);
+  nbytes = STRING_BYTES (XSTRING (msg));
+
+  for (i = 0; i < 3; ++i)
+    {
+      if (i == 0)
+	message2 (XSTRING (msg)->data, nbytes, STRING_MULTIBYTE (msg));
+      else
+	message2_nolog (XSTRING (msg)->data, nbytes, STRING_MULTIBYTE (msg));
+      Fsleep_for (make_number (1), Qnil);
+    }
+
+  UNGCPRO;
   return Qnil;
 }