(empty log message)
@@ -898,7 +898,7 @@ | ||
898 | 898 | for managing a table of bitmap "records" */ |
899 | 899 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m |
900 | 900 | *** ../emacs-23.3-0-lion/src/nsterm.m 2011-12-05 16:50:06.000000000 +0900 |
901 | ---- src/nsterm.m 2011-12-05 17:17:52.000000000 +0900 | |
901 | +--- src/nsterm.m 2011-12-05 17:51:07.000000000 +0900 | |
902 | 902 | *************** ns_term_init (Lisp_Object display_name) |
903 | 903 | *** 3730,3735 **** |
904 | 904 | --- 3730,3738 ---- |
@@ -1064,7 +1064,7 @@ | ||
1064 | 1064 | |
1065 | 1065 | pt = [self convertPoint: pt toView: nil]; |
1066 | 1066 | pt = [[self window] convertBaseToScreen: pt]; |
1067 | ---- 4703,4723 ---- | |
1067 | +--- 4703,4725 ---- | |
1068 | 1068 | { |
1069 | 1069 | NSRect rect; |
1070 | 1070 | NSPoint pt; |
@@ -1073,7 +1073,9 @@ | ||
1073 | 1073 | if (NS_KEYLOG) |
1074 | 1074 | NSLog (@"firstRectForCharRange request"); |
1075 | 1075 | + |
1076 | -+ if (WINDOWP (echo_area_window)) | |
1076 | ++ if (NILP (Feval (Fcons (intern ("ns-in-echo-area"), Qnil)))) | |
1077 | ++ win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe)); | |
1078 | ++ else if (WINDOWP (echo_area_window)) | |
1077 | 1079 | + win = XWINDOW (echo_area_window); |
1078 | 1080 | + else |
1079 | 1081 | + win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe)); |
@@ -1,7 +1,3 @@ | ||
1 | -2011-12-05 HASIMOTO Taiichi <taiichi2@mac.com> | |
2 | - | |
3 | - * src/nsterm.m: 石川さんのパッチを取り込み.auto-save時のクラッシュを回避. | |
4 | - | |
5 | 1 | 2011-12-04 HASHIMOTO Taiichi <taiichi2@mac.com> |
6 | 2 | |
7 | 3 | * src/macim.m: 三代川さんのパッチを取り込み.localeの取得方法の変更. |