• R/O
  • SSH
  • HTTPS

macemacsjp: 提交


Commit MetaInfo

修订版578 (tree)
时间2011-12-05 19:34:53
作者taiichi

Log Message

(empty log message)

更改概述

差异

--- inline_patch/trunk/emacs-inline.patch (revision 577)
+++ inline_patch/trunk/emacs-inline.patch (revision 578)
@@ -898,7 +898,7 @@
898898 for managing a table of bitmap "records" */
899899 diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m
900900 *** ../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
902902 *************** ns_term_init (Lisp_Object display_name)
903903 *** 3730,3735 ****
904904 --- 3730,3738 ----
@@ -1064,7 +1064,7 @@
10641064
10651065 pt = [self convertPoint: pt toView: nil];
10661066 pt = [[self window] convertBaseToScreen: pt];
1067---- 4703,4723 ----
1067+--- 4703,4725 ----
10681068 {
10691069 NSRect rect;
10701070 NSPoint pt;
@@ -1073,7 +1073,9 @@
10731073 if (NS_KEYLOG)
10741074 NSLog (@"firstRectForCharRange request");
10751075 +
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))
10771079 + win = XWINDOW (echo_area_window);
10781080 + else
10791081 + win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
--- inline_patch/trunk/ChangeLog (revision 577)
+++ inline_patch/trunk/ChangeLog (revision 578)
@@ -1,7 +1,3 @@
1-2011-12-05 HASIMOTO Taiichi <taiichi2@mac.com>
2-
3- * src/nsterm.m: 石川さんのパッチを取り込み.auto-save時のクラッシュを回避.
4-
51 2011-12-04 HASHIMOTO Taiichi <taiichi2@mac.com>
62
73 * src/macim.m: 三代川さんのパッチを取り込み.localeの取得方法の変更.
Show on old repository browser