aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKelly Dean2013-06-12 22:13:05 -0700
committerGlenn Morris2013-06-12 22:13:05 -0700
commitafbfe14326d04ba667f6940ac9d67190790bcfd5 (patch)
tree567d5691413936c421449e7ff07981a6a3447592 /src
parent1261d2daeecea574cac763e3e7b729e6b6b36dad (diff)
downloademacs-afbfe14326d04ba667f6940ac9d67190790bcfd5.tar.gz
emacs-afbfe14326d04ba667f6940ac9d67190790bcfd5.zip
* src/fileio.c (Fdo_auto_save): Trap errors in auto-save-hook (tiny change)
Fixes: debbugs:14479
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fileio.c2
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 @@
12013-06-13 Kelly Dean <kellydeanch@yahoo.com> (tiny change)
2
3 * fileio.c (Fdo_auto_save): Trap errors in auto-save-hook. (Bug#14479)
4
12013-06-12 Xue Fuqiao <xfq.free@gmail.com> 52013-06-12 Xue Fuqiao <xfq.free@gmail.com>
2 6
3 * fileio.c (expand_file_name): Doc fix. 7 * 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. */)
5596 point to non-strings reached from Vbuffer_alist. */ 5596 point to non-strings reached from Vbuffer_alist. */
5597 5597
5598 hook = intern ("auto-save-hook"); 5598 hook = intern ("auto-save-hook");
5599 Frun_hooks (1, &hook); 5599 safe_run_hooks (hook);
5600 5600
5601 if (STRINGP (Vauto_save_list_file_name)) 5601 if (STRINGP (Vauto_save_list_file_name))
5602 { 5602 {