2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3e28cd2f2c0..1546348bfbf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-28  William Xu  <william.xwl@gmail.com>
+
+        * nsterm.m (ns_term_shutdown): Synchronize user defaults before
+        exiting (Bug#8239).
+
 2011-05-28  Jim Meyering  <meyering@redhat.com>
 
         Avoid a sign-extension bug in crypto_hash_function.
diff --git a/src/nsterm.m b/src/nsterm.m
index ac9c44a57a9..52e0dc6c2a8 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4058,6 +4058,8 @@ ns_term_init (Lisp_Object display_name)
 void
 ns_term_shutdown (int sig)
 {
+  [[NSUserDefaults standardUserDefaults] synchronize];
+
   /* code not reached in emacs.c after this is called by shut_down_emacs: */
   if (STRINGP (Vauto_save_list_file_name))
     unlink (SDATA (Vauto_save_list_file_name));