Some more patches from Sir Raorn

golded3/geedit.cpp

@@ -1780,7 +1780,8 @@ void IEclass::Reflow() {
   const char* _qlenptr = currline->txt.c_str() + _qlen1;
 
   // Strip leading spaces from the first line
-  const char* ptr = strskip_wht(_qlenptr);
+  const char* ptr = _qlenptr;
+  while(*ptr and isspace(*ptr) and *ptr != '\n') ptr++;
   if(ptr != _qlenptr) {
     Undo->PushItem(EDIT_UNDO_DEL_TEXT, currline, _qlen1, ptr-_qlenptr);
     currline->txt.erase(_qlen1, ptr-_qlenptr);

golded3/geedit2.cpp

@@ -858,6 +858,8 @@ inline char uuencode_enc(int c) { return (char)(c ? (c & 077) + ' ': '`'); }
 
 void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
 
+  XlatName __oldxlatimport;
+
   GFTRK("Editimport");
 
   // Save the unfinished msg first of all
@@ -874,6 +876,9 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
       AA->SetInputfile("*");
   }
 
+  strcpy(__oldxlatimport, AA->Xlatimport());
+  AA->SetXlatimport(CFG->xlatlocalset);
+
   strcpy(CFG->inputfile, AA->Inputfile());
 
   int ImportMode;
@@ -1157,6 +1162,8 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
     }
   }
 
+  AA->SetXlatimport(__oldxlatimport);
+
   GFTRK(NULL);
 }
 

golded3/geline.cpp

@@ -1784,8 +1784,6 @@ static int cmp_quotes(char* q1, char* q2) {
   do {
     q1 = spanspaces(++q1);
     q2 = spanspaces(++q2);
-    if(*q2 == 0)
-      return YES;
     if(*q1 != *q2)
       return NO;
   } while(*q1 and *q2);