Merge branch 'develop' into slegrand-actions

FreeFem · Dec 19, 2024 · 52efec6 · 52efec6
2 parents abc790f + 23f7527
commit 52efec6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/etc/config/m4/WindowsPackage.m4 b/etc/config/m4/WindowsPackage.m4
@@ -22,7 +22,7 @@ AppName=FreeFem++-win`'SIZEOFPTR-VERSION
 AppVerName=FreeFem++ version VERSION (win SIZEOFPTR bits)
 DefaultDirName={commonpf}\FreeFem++`'SUFF64
 DefaultGroupName=FreeFem++`'SUFF64
-
+PrivilegesRequired=admin
 Compression=lzma
 SolidCompression=yes
 ChangesAssociations=yes
@@ -229,7 +229,7 @@ Name: modifypath; Description: &Add application directory to your system path (i
 [Code]
 const
 	ModPathName = 'modifypath';
-	ModPathType = 'user';
+	ModPathType = 'system';
 
 function ModPathDir(): TArrayOfString;
 begin

diff --git a/src/fflib/lex.cpp b/src/fflib/lex.cpp
@@ -267,6 +267,7 @@ int mylex::EatCommentAndSpace(string *data)
         if(ifblock('~')==1 ||ifblock('`')==1 ) {
             LineNumber();// eat CR ???
             incomment=3;// in markdown
+            cnl=1; // starting line !!
         }
         if(incomment==1)
         {// normal case
@@ -332,6 +333,7 @@ int mylex::EatCommentAndSpace(string *data)
                 if (nnn.find("~~~freefem")==0 ||nnn.find("```freefem")==0) // we find => end MD
                     end = 1;
                //  cr eat by getline
+                cnl=1; // starting line !!
             }
             while(!source().eof()  && end == 0 ) ;
             if (echo) cout << "\n" << setw(5) <<linenumber << this->sep() ;