diff options
| author | Miles Bader | 2007-06-11 01:00:07 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-06-11 01:00:07 +0000 |
| commit | 67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch) | |
| tree | 58a0e1bea7a1d8728fd32e6127a44434e7eac006 /src/mac.c | |
| parent | d17cf4eb2024cf54e4a216312184665094ee3df4 (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.tar.gz emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.zip | |
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
Diffstat (limited to 'src/mac.c')
| -rw-r--r-- | src/mac.c | 4 |
1 files changed, 0 insertions, 4 deletions
| @@ -1826,8 +1826,6 @@ xrm_get_preference_database (application) | |||
| 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 | { |
| @@ -1879,8 +1877,6 @@ xrm_get_preference_database (application) | |||
| 1879 | CFRelease (key_set); | 1877 | CFRelease (key_set); |
| 1880 | CFRelease (app_id); | 1878 | CFRelease (app_id); |
| 1881 | 1879 | ||
| 1882 | UNBLOCK_INPUT; | ||
| 1883 | |||
| 1884 | UNGCPRO; | 1880 | UNGCPRO; |
| 1885 | 1881 | ||
| 1886 | return database; | 1882 | return database; |