The R Project SVN – R – Diff – /trunk/src/gnuwin32/system.c

     switch (saveact) {
     case SA_SAVE:
 	if(runLast) R_dot_Last();
 	if(R_DirtyImage) R_SaveGlobalEnv();
 	if (CharacterMode == RGui ||
-	    (R_Interactive && CharacterMode == RTerm))
+	    (R_Interactive && CharacterMode == RTerm)) {
+	    R_setupHistory(); /* re-read the history size and filename */
-	    gl_savehistory(R_HistoryFile);
+	    gl_savehistory(R_HistoryFile, R_HistorySize);
+	}
 	break;
     case SA_NOSAVE:
 	if(runLast) R_dot_Last();
 	break;
     case SA_SUICIDE:
     strcat(msg, msg3);
     if(CharacterMode == RTerm) strcat(msg, msg4);
     return msg;
+}
+void R_setupHistory()
+{
+    int value, ierr;
+    char *p;
+    if ((R_HistoryFile = getenv("R_HISTFILE")) == NULL)
+        R_HistoryFile = ".Rhistory";
+    R_HistorySize = 512;
+    if ((p = getenv("R_HISTSIZE"))) {
+        value = R_Decode2Long(p, &ierr);
+        if (ierr != 0 || value < 0)
+            R_ShowMessage("WARNING: invalid R_HISTSIZE ignored;");
+        else
+            R_HistorySize = value;
+    }
+}
 int cmdlineoptions(int ac, char **av)
+{
     int   i, ierr;
     R_size_t value;
     if (InThreadReadConsole &&
         (!(EhiWakeUp = CreateEvent(NULL, FALSE, FALSE, NULL)) ||
 	 (_beginthread(ReaderThread, 0, NULL) == -1)))
       R_Suicide(_("impossible to create 'reader thread'; you must free some system resources"));
-    if ((R_HistoryFile = getenv("R_HISTFILE")) == NULL)
-	R_HistoryFile = ".Rhistory";
-    R_HistorySize = 512;
+    R_setupHistory();
-    if ((p = getenv("R_HISTSIZE"))) {
-	int value, ierr;
-	value = R_Decode2Long(p, &ierr);
-	if (ierr != 0 || value < 0)
-	    REprintf(_("WARNING: invalid R_HISTSIZE ignored;"));
-	else
-	    R_HistorySize = value;
-    }
     return 0;
+}
 void setup_term_ui()
+{

The R Project SVN R

(root)/trunk/src/gnuwin32/system.c – Rev 33297 → 33494