*** WindowMaker.h.old	Mon Nov  8 15:23:18 1999
--- WindowMaker.h	Mon Nov  8 15:24:14 1999
***************
*** 408,413 ****
--- 408,414 ----
          unsigned int noclip:1;        /* don't display the clip */
  	unsigned int nocpp:1;	       /* don't use cpp */
  	unsigned int noupdates:1;      /* don't require ~/GNUstep (-static) */
+ 	unsigned int noautolaunch:1;   /* don't autolaunch apps */
      } flags;			       /* internal flags */
  } WPreferences;
  
*** main.c.old	Mon Nov  8 15:23:30 1999
--- main.c	Mon Nov  8 16:03:20 1999
***************
*** 262,267 ****
--- 262,268 ----
  #endif
      puts(_(" --no-dock		do not open the application Dock"));
      puts(_(" --no-clip		do not open the workspace Clip"));
+     puts(_(" --no-autolaunch	do not autolaunch applications"));
  
      puts(_(" --locale locale		locale to use"));
  
***************
*** 428,434 ****
  		wPreferences.flags.nocpp=1;
  	    } else
  #endif
! 	    if (strcmp(argv[i], "-nodock")==0
  		|| strcmp(argv[i], "--no-dock")==0) {
  		wPreferences.flags.nodock=1;
  	    } else if (strcmp(argv[i], "-noclip")==0
--- 429,438 ----
  		wPreferences.flags.nocpp=1;
  	    } else
  #endif
! 	    if (strcmp(argv[i], "-no-autolaunch")==0
! 		|| strcmp(argv[i], "--no-autolaunch")==0) {
! 			wPreferences.flags.noautolaunch = 1;
! 	    } else if (strcmp(argv[i], "-nodock")==0
  		|| strcmp(argv[i], "--no-dock")==0) {
  		wPreferences.flags.nodock=1;
  	    } else if (strcmp(argv[i], "-noclip")==0
*** startup.c.old	Mon Nov  8 15:23:41 1999
--- startup.c	Mon Nov  8 16:04:30 1999
***************
*** 856,862 ****
  	if (ws_state == NULL)
  	    wSessionRestoreState(wScreen[j]);
  	
! 	
  	/* auto-launch apps */
  	if (!wPreferences.flags.nodock && wScreen[j]->dock) {
  	    wScreen[j]->last_dock = wScreen[j]->dock;
--- 856,863 ----
  	if (ws_state == NULL)
  	    wSessionRestoreState(wScreen[j]);
  	
! if(!wPreferences.flags.noautolaunch)
! {
  	/* auto-launch apps */
  	if (!wPreferences.flags.nodock && wScreen[j]->dock) {
  	    wScreen[j]->last_dock = wScreen[j]->dock;
***************
*** 872,877 ****
--- 873,879 ----
  		}
  	    }
  	}
+ }
  
  	/* go to workspace where we were before restart */
  	if (ws_state) {