From: Ben Gras <ben@minix3.org>
Date: Mon, 22 Jan 2007 17:08:36 +0000 (+0000)
Subject: . no .vimrc in standard user's dirs
X-Git-Tag: v3.1.3~101
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=e8edfe876d798dfd9dfa512665ec34692536284a;p=minix.git

. no .vimrc in standard user's dirs
. install a vi hardlink to elvis
---

diff --git a/commands/elvis/Makefile b/commands/elvis/Makefile
index d431ea5fd..1f1ab0e9b 100755
--- a/commands/elvis/Makefile
+++ b/commands/elvis/Makefile
@@ -61,6 +61,7 @@ elvprsv:	elvprsv.c
 
 install:	/usr/bin/elvis \
 		/bin/elvis \
+		/usr/bin/vi \
 		/usr/bin/ctags /usr/bin/ref /usr/bin/fmt \
 		/usr/bin/elvrec /usr/bin/elvprsv
 
@@ -70,6 +71,9 @@ install:	/usr/bin/elvis \
 /bin/elvis:	elvis
 	install -cs -o bin elvis $@
 
+/usr/bin/vi:	elvis
+	install -cs -o bin elvis $@
+
 /usr/bin/ctags:	ctags
 	install -cs -o bin ctags $@
 
diff --git a/etc/ast/.vimrc b/etc/ast/.vimrc
deleted file mode 100644
index 1a213fb47..000000000
--- a/etc/ast/.vimrc
+++ /dev/null
@@ -1,93 +0,0 @@
-" An example for a vimrc file.
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2002 Sep 19
-"
-" To use it, copy it to
-"     for Unix and OS/2:  ~/.vimrc
-"	      for Amiga:  s:.vimrc
-"  for MS-DOS and Win32:  $VIM\_vimrc
-"	    for OpenVMS:  sys$login:.vimrc
-
-" When started as "evim", evim.vim will already have done these settings.
-if v:progname =~? "evim"
-  finish
-endif
-
-" Use Vim settings, rather then Vi settings (much better!).
-" This must be first, because it changes other options as a side effect.
-set nocompatible
-
-" allow backspacing over everything in insert mode
-set backspace=indent,eol,start
-
-if has("vms")
-  set nobackup		" do not keep a backup file, use versions instead
-else
-  set backup		" keep a backup file
-endif
-set history=50		" keep 50 lines of command line history
-set ruler		" show the cursor position all the time
-set showcmd		" display incomplete commands
-set incsearch		" do incremental searching
-
-" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
-" let &guioptions = substitute(&guioptions, "t", "", "g")
-
-" Don't use Ex mode, use Q for formatting
-map Q gq
-
-" This is an alternative that also works in block mode, but the deleted
-" text is lost and it only works for putting the current register.
-"vnoremap p "_dp
-
-   :if &term =~ "xterm" || &term =~ "minix"
-   :  if has("terminfo")
-   :    set t_Co=8
-   :    set t_Sf=[3%p1%dm
-   :    set t_Sb=[4%p1%dm
-   :  else
-   :    set t_Co=8
-   :    set t_Sf=[3%dm
-   :    set t_Sb=[4%dm
-   :  endif
-   :endif
-
-" Switch syntax highlighting on, when the terminal has colors
-" Also switch on highlighting the last used search pattern.
-if &t_Co > 2 || has("gui_running")
-  syntax on
-  set hlsearch
-endif
-
-" Only do this part when compiled with support for autocommands.
-if has("autocmd")
-
-  " Enable file type detection.
-  " Use the default filetype settings, so that mail gets 'tw' set to 72,
-  " 'cindent' is on in C files, etc.
-  " Also load indent files, to automatically do language-dependent indenting.
-  filetype plugin indent on
-
-  " Put these in an autocmd group, so that we can delete them easily.
-  augroup vimrcEx
-  au!
-
-  " For all text files set 'textwidth' to 78 characters.
-  autocmd FileType text setlocal textwidth=78
-
-  " When editing a file, always jump to the last known cursor position.
-  " Don't do it when the position is invalid or when inside an event handler
-  " (happens when dropping a file on gvim).
-  autocmd BufReadPost *
-    \ if line("'\"") > 0 && line("'\"") <= line("$") |
-    \   exe "normal g`\"" |
-    \ endif
-
-  augroup END
-
-else
-
-  set autoindent		" always set autoindenting on
-
-endif " has("autocmd")