===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vim/Attic/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/vim/Attic/main.c	1996/10/14 03:55:14	1.5
--- src/usr.bin/vim/Attic/main.c	1996/10/15 08:22:12	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.5 1996/10/14 03:55:14 downsj Exp $	*/
  /* vi:set ts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.6 1996/10/15 08:22:12 downsj Exp $	*/
  /* vi:set ts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
***************
*** 727,734 ****
  #endif
  					)
  				i = do_source((char_u *)VIMRC_FILE, TRUE);
  #ifdef UNIX
! 			if (i == FAIL)
  			{
  				struct stat s;
  
--- 727,737 ----
  #endif
  					)
  				i = do_source((char_u *)VIMRC_FILE, TRUE);
+ 
+ 			if (i != FAIL)
+ 				check_version = TRUE;
  #ifdef UNIX
! 			else
  			{
  				struct stat s;
  
***************
*** 738,750 ****
  				else
  					secure = 0;
  			}
- 			else
- 				check_version = TRUE;
  #endif
  			if (i == FAIL && fullpathcmp((char_u *)USR_EXRC_FILE,
  											 (char_u *)EXRC_FILE) != FPC_SAME)
  				(void)do_source((char_u *)EXRC_FILE, FALSE);
  		}
  	}
  
  	/*
--- 741,754 ----
  				else
  					secure = 0;
  			}
  #endif
  			if (i == FAIL && fullpathcmp((char_u *)USR_EXRC_FILE,
  											 (char_u *)EXRC_FILE) != FPC_SAME)
  				(void)do_source((char_u *)EXRC_FILE, FALSE);
  		}
+ 		if (secure == 2)
+ 			need_wait_return = TRUE;
+ 		secure = 0;
  	}
  
  	/*
***************
*** 860,866 ****
   * by termcapinit and redifined in .exrc.
   */
  	settmode(1);
! 	if (secure == 2 || need_wait_return || msg_didany)
  		wait_return(TRUE);
  
  	starttermcap();			/* start termcap if not done by wait_return() */
--- 864,870 ----
   * by termcapinit and redifined in .exrc.
   */
  	settmode(1);
! 	if (need_wait_return || msg_didany)
  		wait_return(TRUE);
  
  	starttermcap();			/* start termcap if not done by wait_return() */
***************
*** 869,876 ****
  #endif
  	if (scroll_region)
  		scroll_region_reset();			/* In case Rows changed */
- 
- 	secure = 0;
  
  	scroll_start();
  
--- 873,878 ----