svnno****@sourc*****
svnno****@sourc*****
2011年 12月 5日 (月) 17:24:50 JST
Revision: 577
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=577
Author: taiichi
Date: 2011-12-05 17:24:50 +0900 (Mon, 05 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
inline_patch/trunk/ChangeLog
inline_patch/trunk/emacs-inline.patch
-------------- next part --------------
Modified: inline_patch/trunk/ChangeLog
===================================================================
--- inline_patch/trunk/ChangeLog 2011-12-05 08:04:22 UTC (rev 576)
+++ inline_patch/trunk/ChangeLog 2011-12-05 08:24:50 UTC (rev 577)
@@ -1,3 +1,7 @@
+2011-12-05 HASIMOTO Taiichi <taiic****@mac*****>
+
+ * src/nsterm.m: 石川さんのパッチを取り込み．auto-save時のクラッシュを回避．
+
2011-12-04 HASHIMOTO Taiichi <taiic****@mac*****>
* src/macim.m: 三代川さんのパッチを取り込み．localeの取得方法の変更．
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2011-12-05 08:04:22 UTC (rev 576)
+++ inline_patch/trunk/emacs-inline.patch 2011-12-05 08:24:50 UTC (rev 577)
@@ -898,7 +898,7 @@
for managing a table of bitmap "records" */
diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m
*** ../emacs-23.3-0-lion/src/nsterm.m 2011-12-05 16:50:06.000000000 +0900
---- src/nsterm.m 2011-12-04 17:01:12.000000000 +0900
+--- src/nsterm.m 2011-12-05 17:17:52.000000000 +0900
*************** ns_term_init (Lisp_Object display_name)
*** 3730,3735 ****
--- 3730,3738 ----
@@ -1064,7 +1064,7 @@
pt = [self convertPoint: pt toView: nil];
pt = [[self window] convertBaseToScreen: pt];
---- 4703,4725 ----
+--- 4703,4723 ----
{
NSRect rect;
NSPoint pt;
@@ -1073,9 +1073,7 @@
if (NS_KEYLOG)
NSLog (@"firstRectForCharRange request");
+
-+ if (NILP (Feval (Fcons (intern ("ns-in-echo-area"), Qnil))))
-+ win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
-+ else if (WINDOWP (echo_area_window))
++ if (WINDOWP (echo_area_window))
+ win = XWINDOW (echo_area_window);
+ else
+ win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));