===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/post-msg-asirgui/asirgui.mac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- OpenXM_contrib2/windows/post-msg-asirgui/asirgui.mac	2013/11/14 17:28:29	1.4
+++ OpenXM_contrib2/windows/post-msg-asirgui/asirgui.mac	2013/11/19 13:03:59	1.5
@@ -1,90 +1,90 @@
-// $OpenXM: OpenXM_contrib2/windows/post-msg-asirgui/asirgui.mac,v 1.3 2013/11/14 17:21:51 ohara Exp $
-// Keep shift-jis code! 
-call Main;
-endmacro;
-Main:
-$asirpath=getenv("HOMEPATH")+"\\Desktop\\asir\\bin\\";
-$asir_rootdir=getenv("ASIR_ROOTDIR");
-if($asir_rootdir!="" && existfile($asir_rootdir+"\\bin\\asirgui.exe")) {
-    $asirpath=$asir_rootdir+"\\bin\\";
-}
-menu "asirgui起動","編集中のファイルの実行","選択範囲の実行","行の実行","選択範囲の実行(paste)","行の実行(paste)";
-if (result==0) endmacro;
-else if (result == 1) {
-  run $asirpath+"asirgui";
-} else if (result == 2) {
-  run "cmd /c "+$asirpath+"cmdasir %f";
-} else if (result == 3) {
-  call ExecuteSelectedArea;
-} else if (result == 4) {
-  call ExecuteSelectedLine;
-} else if (result == 5) {
-  call ExecuteSelectedAreaByPaste;
-} else if (result == 6) {
-  call ExecuteSelectedLineByPaste;
-}
-return true;
-ExecuteSelectedArea:
-  if(selecting) { 
-  $s = gettext(seltopx,seltopy,selendx,selendy); 
-//  message "選択範囲は、" + $s + "です. ステルスウインドウに書き出すのはまだ書いてない.";
-    $tmp_fname = getenv("TEMP")+"\\cmdasir-tmp-hidemaru.rr";
-    run "cmd /c del "+$tmp_fname ;
-    call MakeFile $tmp_fname,$s;
-    run "cmd /c "+$asirpath+"cmdasir "+$tmp_fname;
-  } else { 
-  message "範囲選択されていません";
-  }
-  return true; 
-ExecuteSelectedLine:
-  golinetop;
-  beginsel;
-  golineend;
-//  message(str(seltopx) + "," + str(seltopy) + "," + str(selendx) + "," + str(selendy));
-  call ExecuteSelectedArea;
-  return true;
-
-// MakeFile in cmd_perl. See 
-//	http://d.hatena.ne.jp/ohtorii/
-//	https://github.com/ohtorii
-
-MakeFile:
-	$$tmp_filename	= $$1;
-	##old_charset	= charset;
-	$$text=$$2;
-	##prev_hidemaru = hidemaruhandle(0);
-
-	openfile "/h " + $$tmp_filename;
-	if(! result){
-		message("テンポラリファイルのオープンに失敗。\n" + $$tmp_filename);
-		return false;
-	}
-	##new_hidemaru = hidemaruhandle(0);
-	setencode ##old_charset,1;
-	insert $$text;
-
-	save;
-	setactivehidemaru	##prev_hidemaru;
-	closehidemaruforced ##new_hidemaru;
-	return true;
-
-ExecuteSelectedAreaByPaste:
-  if(selecting) { 
-  $s = gettext(seltopx,seltopy,selendx,selendy); 
-//  message "選択範囲は、" + $s + "です. ステルスウインドウに書き出すのはまだ書いてない.";
-    $tmp_fname = getenv("TEMP")+"\\cmdasir-tmp-hidemaru.rr";
-    run "cmd /c del "+$tmp_fname ;
-    call MakeFile $tmp_fname,$s;
-    run "cmd /c "+$asirpath+"cmdasir --paste-contents "+$tmp_fname;
-  } else { 
-  message "範囲選択されていません";
-  }
-  return true; 
-ExecuteSelectedLineByPaste:
-  golinetop;
-  beginsel;
-  golineend;
-//  message(str(seltopx) + "," + str(seltopy) + "," + str(selendx) + "," + str(selendy));
-  call ExecuteSelectedAreaByPaste;
-  return true;
-
+// $OpenXM: OpenXM_contrib2/windows/post-msg-asirgui/asirgui.mac,v 1.4 2013/11/14 17:28:29 ohara Exp $
+// Keep shift-jis code! 
+call Main;
+endmacro;
+Main:
+$asirpath=getenv("HOMEPATH")+"\\Desktop\\asir\\bin\\";
+$asir_rootdir=getenv("ASIR_ROOTDIR");
+if($asir_rootdir!="" && existfile($asir_rootdir+"\\bin\\asirgui.exe")) {
+    $asirpath=$asir_rootdir+"\\bin\\";
+}
+menu "asirgui起動","編集中のファイルの実行","選択範囲の実行","行の実行","選択範囲の実行(paste)","行の実行(paste)";
+if (result==0) endmacro;
+else if (result == 1) {
+  run $asirpath+"asirgui";
+} else if (result == 2) {
+  run "cmd /c \""+$asirpath+"cmdasir\" %f";
+} else if (result == 3) {
+  call ExecuteSelectedArea;
+} else if (result == 4) {
+  call ExecuteSelectedLine;
+} else if (result == 5) {
+  call ExecuteSelectedAreaByPaste;
+} else if (result == 6) {
+  call ExecuteSelectedLineByPaste;
+}
+return true;
+ExecuteSelectedArea:
+  if(selecting) { 
+  $s = gettext(seltopx,seltopy,selendx,selendy); 
+//  message "選択範囲は、" + $s + "です. ステルスウインドウに書き出すのはまだ書いてない.";
+    $tmp_fname = getenv("TEMP")+"\\cmdasir-tmp-hidemaru.rr";
+    run "cmd /c del "+$tmp_fname ;
+    call MakeFile $tmp_fname,$s;
+    run "cmd /c \""+$asirpath+"cmdasir\" "+$tmp_fname;
+  } else { 
+  message "範囲選択されていません";
+  }
+  return true; 
+ExecuteSelectedLine:
+  golinetop;
+  beginsel;
+  golineend;
+//  message(str(seltopx) + "," + str(seltopy) + "," + str(selendx) + "," + str(selendy));
+  call ExecuteSelectedArea;
+  return true;
+
+// MakeFile in cmd_perl. See 
+//	http://d.hatena.ne.jp/ohtorii/
+//	https://github.com/ohtorii
+
+MakeFile:
+	$$tmp_filename	= $$1;
+	##old_charset	= charset;
+	$$text=$$2;
+	##prev_hidemaru = hidemaruhandle(0);
+
+	openfile "/h " + $$tmp_filename;
+	if(! result){
+		message("テンポラリファイルのオープンに失敗。\n" + $$tmp_filename);
+		return false;
+	}
+	##new_hidemaru = hidemaruhandle(0);
+	setencode ##old_charset,1;
+	insert $$text;
+
+	save;
+	setactivehidemaru	##prev_hidemaru;
+	closehidemaruforced ##new_hidemaru;
+	return true;
+
+ExecuteSelectedAreaByPaste:
+  if(selecting) { 
+  $s = gettext(seltopx,seltopy,selendx,selendy); 
+//  message "選択範囲は、" + $s + "です. ステルスウインドウに書き出すのはまだ書いてない.";
+    $tmp_fname = getenv("TEMP")+"\\cmdasir-tmp-hidemaru.rr";
+    run "cmd /c del "+$tmp_fname ;
+    call MakeFile $tmp_fname,$s;
+    run "cmd /c \""+$asirpath+"cmdasir\" --paste-contents "+$tmp_fname;
+  } else { 
+  message "範囲選択されていません";
+  }
+  return true; 
+ExecuteSelectedLineByPaste:
+  golinetop;
+  beginsel;
+  golineend;
+//  message(str(seltopx) + "," + str(seltopy) + "," + str(selendx) + "," + str(selendy));
+  call ExecuteSelectedAreaByPaste;
+  return true;
+