diff options
| author |   downsj <downsj@openbsd.org> | 1996-10-15 08:22:08 +0000 |
|---|---|---|
| committer | downsj <downsj@openbsd.org> | 1996-10-15 08:22:08 +0000 |
| commit | 9836880e936645b71407c0f9197a5e38a26bafef (patch) | |
| tree | fc5e3b6e7f21b1e2b52b81ddaaeaf804405a2a0f | |
| parent | sync with the, uh, real 4.5 release. (diff) | |
| download | wireguard-openbsd-9836880e936645b71407c0f9197a5e38a26bafef.tar.xz wireguard-openbsd-9836880e936645b71407c0f9197a5e38a26bafef.zip | |
bug fix from mool via vimdev.
| -rw-r--r-- | usr.bin/vim/gui.c | 6 | ||||
| -rw-r--r-- | usr.bin/vim/main.c | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/usr.bin/vim/gui.c b/usr.bin/vim/gui.c index 1c41d15c2bb..4525412f122 100644 --- a/usr.bin/vim/gui.c +++ b/usr.bin/vim/gui.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gui.c,v 1.2 1996/09/21 06:23:01 downsj Exp $ */ +/* $OpenBSD: gui.c,v 1.3 1996/10/15 08:22:08 downsj Exp $ */ /* vi:set ts=4 sw=4: * * VIM - Vi IMproved by Bram Moolenaar @@ -277,6 +277,10 @@ gui_init() #endif ) i = do_source((char_u *)GVIMRC_FILE, FALSE); + + if (secure == 2) + need_wait_return = TRUE; + secure = 0; } /* diff --git a/usr.bin/vim/main.c b/usr.bin/vim/main.c index 6385399f0b9..95391c80957 100644 --- a/usr.bin/vim/main.c +++ b/usr.bin/vim/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.5 1996/10/14 03:55:14 downsj Exp $ */ +/* $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,8 +727,11 @@ main(argc, argv) #endif ) i = do_source((char_u *)VIMRC_FILE, TRUE); + + if (i != FAIL) + check_version = TRUE; #ifdef UNIX - if (i == FAIL) + else { struct stat s; @@ -738,13 +741,14 @@ main(argc, argv) 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); } + if (secure == 2) + need_wait_return = TRUE; + secure = 0; } /* @@ -860,7 +864,7 @@ main(argc, argv) * by termcapinit and redifined in .exrc. */ settmode(1); - if (secure == 2 || need_wait_return || msg_didany) + if (need_wait_return || msg_didany) wait_return(TRUE); starttermcap(); /* start termcap if not done by wait_return() */ @@ -870,8 +874,6 @@ main(argc, argv) if (scroll_region) scroll_region_reset(); /* In case Rows changed */ - secure = 0; - scroll_start(); if (!invoked_as_ex) { |