Dejan/various fixes

linux.mak

@@ -86,6 +86,9 @@ $O/termio.o: $S/termio.d
 $O/url.o: $S/url.d
 	$(DMD) -c $(DFLAGS) $S/url.d
 
+$O/utf.o: $S/utf.d
+	$(DMD) -c $(DFLAGS) $S/utf.d
+
 $O/window.o: $S/window.d
 	$(DMD) -c $(DFLAGS) $S/window.d
 

src/med/console.d

@@ -14,23 +14,21 @@
 
 module console;
 
-version (Windows)
-{
-
 import std.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
-import core.sys.windows.windows;
-import core.sys.windows.winuser;
 
 import ed;
 import disp;
 
+version (Windows)
+{
+import core.sys.windows.windows;
+import core.sys.windows.winuser;
 
 enum BEL = 0x07;                    /* BEL character.               */
 enum ESC = 0x1B;                    /* ESC character.               */
 
-
 static HANDLE hStdin;			// console input handle
 static DWORD fdwSaveOldMode;
 
@@ -487,5 +485,4 @@ int help(bool f, int n)
     return ed.FALSE;
 }
 
-}
-
+} // Windows version

src/med/display.d

@@ -318,13 +318,15 @@ int coltodoto(LINE* lp, int col)
 {
     size_t len = llength(lp);
     size_t i = 0;
+	int ii = 0;
     while (i < len)
     {
-	if (getcol(lp,i) >= col)
-	    return i;
+		ii = cast(int) i;
+		if (getcol(lp, ii) >= col)
+	    	return ii;
 	decodeUTF8(lp.l_text, i);
     }
-    return i;
+    return ii;
 }
 
 /***********************
@@ -591,12 +593,12 @@ Lout:
 			}
 			if (inmark == 2)
 			    inmark = 0;
+			if (!nextLine)
+			    break;
                         lp = lforw(lp);
                     }
                     vteeol(wp.w_startcol);
                     ++i;
-		    if (!nextLine)
-			break;
                 }
             }
 debug (WFDEBUG)

src/med/main.d

@@ -56,6 +56,7 @@ import display;
 import terminal;
 import line;
 import mouse;
+import console;                         // help
 
 int     currow;                         /* Working cursor row           */
 int     fillcol;                        /* Current fill column          */

src/med/url.d

@@ -1,3 +1,4 @@
+module url;
 
 import core.stdc.stdio;
 import core.stdc.ctype;

src/med/utf.d

@@ -1,4 +1,4 @@
-
+module utf;
 
 /* This version of microEmacs is based on the public domain C
  * version written by Dave G. Conroy.

src/med/xterm.d

@@ -596,4 +596,14 @@ debug
     }
 }
 
+import std.process: spawnProcess;
+
+int help(bool f, int n)
+{
+	printf("\nhelp \n");
+	auto dmdPid = spawnProcess(["xdg-open", "me.html"]);
+
+	return ed.FALSE;
 }
+
+} // Posix version