aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Robert2009-09-18 23:36:29 +0000
committerAdrian Robert2009-09-18 23:36:29 +0000
commit4acaaa2b244107b14735e8c917a3dbce1b70fb64 (patch)
treedf28c821c99aaab9ab4ff59be74153e6394ce2dc
parentcb8e527a2997a6211c17ae16d500611ba6490517 (diff)
downloademacs-4acaaa2b244107b14735e8c917a3dbce1b70fb64.tar.gz
emacs-4acaaa2b244107b14735e8c917a3dbce1b70fb64.zip
* nsfns.m (x-focus-frame): Activate the app first.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/nsfns.m1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ad7ab0b6544..dd4d519c54c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -20,6 +20,7 @@
20 * nsfns.m (x_get_string_resource): Ape just-previous changes to other 20 * nsfns.m (x_get_string_resource): Ape just-previous changes to other
21 platform versions. Drop support for emacs-20-style face specs. 21 platform versions. Drop support for emacs-20-style face specs.
22 (x-close-connection): Drop PSFlush() under OS X. 22 (x-close-connection): Drop PSFlush() under OS X.
23 (x-focus-frame): Activate the app first.
23 24
242009-09-17 Juanma Barranquero <lekktu@gmail.com> 252009-09-17 Juanma Barranquero <lekktu@gmail.com>
25 26
diff --git a/src/nsfns.m b/src/nsfns.m
index ab77a12b2ac..d6e1672b587 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1365,6 +1365,7 @@ FRAME nil means use the selected frame. */)
1365 { 1365 {
1366 EmacsView *view = FRAME_NS_VIEW (f); 1366 EmacsView *view = FRAME_NS_VIEW (f);
1367 BLOCK_INPUT; 1367 BLOCK_INPUT;
1368 [NSApp activateIgnoringOtherApps: YES];
1368 [[view window] makeKeyAndOrderFront: view]; 1369 [[view window] makeKeyAndOrderFront: view];
1369 UNBLOCK_INPUT; 1370 UNBLOCK_INPUT;
1370 } 1371 }