Mercurial > emacs

comparison src/mac.c @ 83632:cc587bfd19ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 781-792) - Update from CVS - Merge from gnus--rel--5.10 - Merge from emacs--rel--22 * emacs--rel--22 (patch 33-41) * gnus--rel--5.10 (patch 226-228) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
author Miles Bader <miles@gnu.org>
date Mon, 11 Jun 2007 01:00:07 +0000
parents 01f9f93abc4c
children b98604865ea0 e9f94688a064
comparison
equal deleted inserted replaced
83631:7d63b897231b 83632:cc587bfd19ca
1824 1824
1825 database = xrm_create_database (); 1825 database = xrm_create_database ();
1826 1826
1827 GCPRO3 (database, quarks, value); 1827 GCPRO3 (database, quarks, value);
1828 1828
1829 BLOCK_INPUT;
1830
1831 app_id = kCFPreferencesCurrentApplication; 1829 app_id = kCFPreferencesCurrentApplication;
1832 if (application) 1830 if (application)
1833 { 1831 {
1834 app_id = cfstring_create_with_utf8_cstring (application); 1832 app_id = cfstring_create_with_utf8_cstring (application);
1835 if (app_id == NULL) 1833 if (app_id == NULL)
1876 xfree (keys); 1874 xfree (keys);
1877 out: 1875 out:
1878 if (key_set) 1876 if (key_set)
1879 CFRelease (key_set); 1877 CFRelease (key_set);
1880 CFRelease (app_id); 1878 CFRelease (app_id);
1881
1882 UNBLOCK_INPUT;
1883 1879
1884 UNGCPRO; 1880 UNGCPRO;
1885 1881
1886 return database; 1882 return database;
1887 #else 1883 #else