diff options
| author | William Xu | 2011-05-28 12:56:53 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-05-28 12:56:53 -0400 |
| commit | 5ba6571dd9564a146c80bef5d6ed08efb309cf43 (patch) | |
| tree | 240dc2ca26632d16df08157992767a367a1b0ec8 /src | |
| parent | e19009947f240e90f3b138e8435697d159848332 (diff) | |
| download | emacs-5ba6571dd9564a146c80bef5d6ed08efb309cf43.tar.gz emacs-5ba6571dd9564a146c80bef5d6ed08efb309cf43.zip | |
* src/nsterm.m (ns_term_shutdown): Synchronize user defaults before exiting (Bug#8239).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 2 |
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 @@ | |||
| 1 | 2011-05-28 William Xu <william.xwl@gmail.com> | ||
| 2 | |||
| 3 | * nsterm.m (ns_term_shutdown): Synchronize user defaults before | ||
| 4 | exiting (Bug#8239). | ||
| 5 | |||
| 1 | 2011-05-28 Jim Meyering <meyering@redhat.com> | 6 | 2011-05-28 Jim Meyering <meyering@redhat.com> |
| 2 | 7 | ||
| 3 | Avoid a sign-extension bug in crypto_hash_function. | 8 | 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) | |||
| 4058 | void | 4058 | void |
| 4059 | ns_term_shutdown (int sig) | 4059 | ns_term_shutdown (int sig) |
| 4060 | { | 4060 | { |
| 4061 | [[NSUserDefaults standardUserDefaults] synchronize]; | ||
| 4062 | |||
| 4061 | /* code not reached in emacs.c after this is called by shut_down_emacs: */ | 4063 | /* code not reached in emacs.c after this is called by shut_down_emacs: */ |
| 4062 | if (STRINGP (Vauto_save_list_file_name)) | 4064 | if (STRINGP (Vauto_save_list_file_name)) |
| 4063 | unlink (SDATA (Vauto_save_list_file_name)); | 4065 | unlink (SDATA (Vauto_save_list_file_name)); |