The R Project SVN – R – Diff – /branches/R-exp-R5/src/gnuwin32/preferences.c

     strcpy(gui->style, "normal");
     gui->tt_font = 1;
     gui->pointsize = 10;
     strcpy(gui->language, "");
     gui->buffered = 1;
+    gui->warning[0] = 0;
 #ifdef USE_MDI
     gui->toolbar = ((RguiMDI & RW_TOOLBAR) != 0);
     gui->statusbar = ((RguiMDI & RW_STATUSBAR) != 0);
     gui->MDI = ((RguiMDI & RW_MDI) != 0);
 	/* Font colours */
 	for (int i=0; i<numGuiColors; i++)
 	    gui->guiColors[i] = guiColors[i];
 	/* MDIsize is not currently a choice in the dialog, only in the Rconsole file, so is not set here */
+	gui->warning[0] = 0;
     } else
 	getDefaults(gui);
+}
 static int has_changed(Gui a, Gui b)
     optf = askfilenamewithdir(G_("Select 'Rconsole' file"), "Rconsole", buf);
     if(!optf) return;
     getChoices(&newGUI);
     if (loadRconsole(&newGUI, optf)) {
+        if (strlen(newGUI.warning)) askok(newGUI.warning);
 	cleanup();
 	showDialog(&newGUI);
+    }
+}
 	    if (!strcmp(opt[0], "language")) {
 		strcpy(gui->language, opt[1]);
 		done = 1;
+	    }
+	}
-	if (!done) {
+	if (!done)
-	    char  buf[128];
+	    snprintf(gui->warning, sizeof(gui->warning),
-	    snprintf(buf, 128, G_("Error at line %d of file %s"),
+	             G_("Ignored '%s' at line %d of file %s"),
-		     optline(), optfile());
+	                opt[0], optline(), optfile());
-	    askok(buf);
-	    cfgerr = 1;
-	}
+    }
     return !cfgerr;
+}
 static void apply(button b) /* button callback */

The R Project SVN R