2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 38eb460359c..4d6e669612f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-13  Kelly Dean  <kellydeanch@yahoo.com>  (tiny change)
+
+        * fileio.c (Fdo_auto_save): Trap errors in auto-save-hook.  (Bug#14479)
+
 2013-06-12  Xue Fuqiao  <xfq.free@gmail.com>
 
         * fileio.c (expand_file_name): Doc fix.
diff --git a/src/fileio.c b/src/fileio.c
index ce5d4854fee..6a60186a84f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5596,7 +5596,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
      point to non-strings reached from Vbuffer_alist.  */
 
   hook = intern ("auto-save-hook");
-  Frun_hooks (1, &hook);
+  safe_run_hooks (hook);
 
   if (STRINGP (Vauto_save_list_file_name))
     {