Merge pull request #1656 from fmoralesc/remove-easy-mode

Remove "easy" mode.

23 files changed, 15 insertions, 596 deletions

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 82fd921038..1f2affe829 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -254,33 +254,27 @@ HTMLS = \
 
 MANPAGES = \
 	manpages/vim.man \
-	manpages/evim.man \
 	manpages/vimdiff.man \
 	manpages/vimtutor.man \
 	manpages/xxd.man \
 	manpages/de/vim-de.man \
 	manpages/fr/vim-fr.man \
-	manpages/fr/evim-fr.man \
 	manpages/fr/vimdiff-fr.man \
 	manpages/fr/vimtutor-fr.man \
 	manpages/fr/xxd-fr.man \
 	manpages/pl/vim-pl.man \
-	manpages/pl/evim-pl.man \
 	manpages/pl/vimdiff-pl.man \
 	manpages/pl/vimtutor-pl.man \
 	manpages/pl/xxd-pl.man \
 	manpages/it/vim-it.man \
-	manpages/it/evim-it.man \
 	manpages/it/vimdiff-it.man \
 	manpages/it/vimtutor-it.man \
 	manpages/it/xxd-it.man \
 	manpages/ru/vim-ru.man \
-	manpages/ru/evim-ru.man \
 	manpages/ru/vimdiff-ru.man \
 	manpages/ru/vimtutor-ru.man \
 	manpages/ru/xxd-ru.man \
 	manpages/ja/vim-ja.man \
-	manpages/ja/evim-ja.man \
 	manpages/ja/vimdiff-ja.man \
 	manpages/ja/vimtutor-ja.man \
 	manpages/ja/xxd-ja.man
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 65b1f2aa3c..6f5dddb335 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1554,8 +1554,8 @@ v:profiling	Normally zero.	Set to one after using ":profile start".
 
 					*v:progname* *progname-variable*
 v:progname	Contains the name (with path removed) with which Vim was
-		invoked.  Allows you to do special initialisations for |view|,
-		|evim| etc., or any other name you might symlink to Vim.
+		invoked.  Allows you to do special initialisations for |view|, 
+		|vimdiff|, etc., or any other name you might symlink to Vim.
 		Read-only.
 
 					*v:progpath* *progpath-variable*
diff --git a/runtime/doc/manpages/de/vim-de.1 b/runtime/doc/manpages/de/vim-de.1
index f79e622a74..3b26550072 100644
--- a/runtime/doc/manpages/de/vim-de.1
+++ b/runtime/doc/manpages/de/vim-de.1
@@ -23,7 +23,7 @@ vim \- Vi IMproved, ein Text\-Editor für Programmierer
 .br
 \fBview\fP
 .br
-\fBgvim\fP \fBgview\fP \fBevim\fP \fBeview\fP
+\fBgvim\fP \fBgview\fP
 .br
 \fBrvim\fP \fBrview\fP \fBrgvim\fP \fBrgview\fP
 .SH BESCHREIBUNG
@@ -101,10 +101,6 @@ gvim gview
 Die grafische Version: Öffnet ein neues Fenster. Dasselbe wird mit dem
 Parameter »\-g« erreicht.
 .TP 
-evim eview
-Die grafische Version im einfachen Modus: Öffnet ein neues Fenster. Dasselbe
-wird mit dem Parameter »\-y« erreicht.
-.TP 
 rvim rview rgvim rgview
 Wie die obigen, aber mit Beschränkungen: Es ist nicht möglich, Shell\-Befehle
 aufzurufen oder mit Unterbrechung in eine Shell zurückzuspringen. Dasselbe
@@ -333,11 +329,6 @@ Führt keine Verbindung zum X\-Server durch. Dadurch verkürzt sich die
 Startzeit, aber der Fenstertitel und die Zwischenablage werden nicht
 verwendet.
 .TP 
-\-y
-Startet \fBVim\fP im einfachen Modus, als würde die ausführbare Datei mit
-»evim« oder »eview« aufgerufen. \fBVim\fP verhält sich dann wie ein Editor zum
-Klicken und Tippen.
-.TP 
 \-Z
 Eingeschränkter Modus: Funktioniert, als würde der Name der ausführbaren
 Datei mit »r« beginnen.
diff --git a/runtime/doc/manpages/evim.1 b/runtime/doc/manpages/evim.1
deleted file mode 100644
index bb859ceada..0000000000
--- a/runtime/doc/manpages/evim.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH EVIM 1 "2002 February 16"
-.SH NAME
-evim \- easy Vim, edit a file with Vim and setup for modeless editing
-.SH SYNOPSIS
-.br
-.B evim
-[options] [file ..]
-.br
-.B eview
-.SH DESCRIPTION
-.B eVim
-starts
-.B Vim
-and sets options to make it behave like a modeless editor.
-This is still Vim but used as a point-and-click editor.
-This feels a lot like using Notepad on MS-Windows.
-.B eVim
-will always run in the GUI, to enable the use of menus and toolbar.
-.PP
-Only to be used for people who really can't work with Vim in the normal way.
-Editing will be much less efficient.
-.PP
-.B eview
-is the same, but starts in read-only mode.  It works just like evim \-R.
-.PP
-See vim(1) for details about Vim, options, etc.
-.PP
-The 'insertmode' option is set to be able to type text directly.
-.br
-Mappings are setup to make Copy and Paste work with the MS-Windows keys.
-CTRL-X cuts text, CTRL-C copies text and CTRL-V pastes text.
-Use CTRL-Q to obtain the original meaning of CTRL-V.
-.SH OPTIONS
-See vim(1).
-.SH FILES
-.TP 15
-/usr/local/lib/vim/evim.vim
-The script loaded to initialize eVim.
-.SH AKA
-Also Known As "Vim for gumbies".
-When using evim you are expected to take a handkerchief,
-make a knot in each corner and wear it on your head.
-.SH SEE ALSO
-vim(1)
-.SH AUTHOR
-Most of
-.B Vim
-was made by Bram Moolenaar, with a lot of help from others.
-See the Help/Credits menu.
diff --git a/runtime/doc/manpages/fr/evim-fr.1 b/runtime/doc/manpages/fr/evim-fr.1
deleted file mode 100644
index 2b38e66cb5..0000000000
--- a/runtime/doc/manpages/fr/evim-fr.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.TH EVIM 1 "16 février 2002"
-.SH NAME
-evim \- « Easy Vim », édite un fichier avec Vim sans utiliser les modes
-.SH SYNOPSIS
-.br
-.B evim
-[options] [fichier ...]
-.br
-.B eview
-.SH DESCRIPTION
-.B eVim
-lance
-.B Vim
-et configure ses options afin qu'il se comporte comme un éditeur sans mode.
-Cela reste Vim, mais vous pouvez l'utiliser comme un éditeur « cliquer-taper ».
-Cela ressemble beaucoup à l'édition avec Notepad sur MS-Windows.
-.B eVim
-ne fonctionne qu'avec l'interface graphique, qui est nécessaire pour permettre
-l'utilisation des menus et de la barre d'outils.
-.PP
-Il n'est utile qu'aux personnes qui ne parviennent vraiment pas à utiliser Vim
-de façon traditionnelle. L'édition est alors bien moins efficace.
-.PP
-.B eview
-fait la même chose, mais démarre Vim en mode Lecture-seule.
-Cela revient à lancer evim \-R.
-.PP
-Voir vim(1) pour davantage d'informations sur Vim, les options, etc.
-.PP
-L'option 'insertmode' est activée pour permettre de taper directement du texte.
-.br
-Les mappages sont configurés pour que Copier et Coller fonctionnent avec les
-raccourcis habituels de MS-Windows. CTRL-X coupe le texte, CTRL-C copie le
-texte et CTRL-V colle le texte.
-Vous pouvez utiliser CTRL-Q pour obtenir la fonction originale de CTRL-V.
-.SH OPTIONS
-Voir vim(1).
-.SH FICHIERS
-.TP 15
-/usr/local/lib/vim/evim.vim
-Le script chargé pour initialiser eVim.
-.SH AUSSI CONNU SOUS
-Également connu sous le nom « Vim pour gumbies » [N.D.T. : Flying Circus...].
-Quand vous utilisez eVim, vous êtes censé prendre un mouchoir de poche,
-faire un noeud à chaque coin et le porter sur votre tête.
-.SH VOIR AUSSI
-vim(1)
-.SH AUTEUR
-La majeure partie de
-.B Vim
-a été écrite par Bram Moolenaar, avec l'aide de nombreux autres contributeurs.
-Voir le menu Aide/Remerciements ou ":help credits" dans
-.B Vim.
-.SH TRADUCTION
-Cette page de manuel a été traduite David Blanchet.
-<david.blanchet@free.fr> 2005-03-26.
-Mise à jour 2013-05-10, Dominique Pellé <dominique.pelle@gmail.com>
diff --git a/runtime/doc/manpages/fr/vim-fr.1 b/runtime/doc/manpages/fr/vim-fr.1
index 67be106673..0559f5714b 100644
--- a/runtime/doc/manpages/fr/vim-fr.1
+++ b/runtime/doc/manpages/fr/vim-fr.1
@@ -29,8 +29,6 @@ vim \- Vi IMproved, éditeur de texte pour programmeurs
 .br
 .B gvim
 .B gview
-.B evim
-.B eview
 .br
 .B rvim
 .B rview
@@ -125,11 +123,6 @@ La version graphique.
 Ouvre une nouvelle fenêtre.
 Également accessible avec l'argument "\-g".
 .TP
-evim eview
-La version graphique en mode Débutant (easy).
-Ouvre une nouvelle fenêtre.
-Également accessible avec l'argument "\-y".
-.TP
 rvim rview rgvim rgview
 Comme ci-dessus, mais avec des restrictions. Il vous sera impossible de
 lancer des commandes du shell, ou de suspendre
@@ -421,14 +414,6 @@ Chiffre les fichiers lors de l'écriture. Une clé de chiffrement sera demandée
 Ne se connecte pas au serveur X. Accélère le temps de démarrage dans un
 terminal, mais le titre de la fenêtre et le presse-papier seront inaccessibles.
 .TP
-\-y
-Démarre
-.B Vim
-en mode Débutant (easy), comme si l'exécutable s'appelait "evim" ou "eview".
-Donne à
-.B Vim
-un comportement plus proche des éditeurs « cliquez-tapez ».
-.TP
 \-Z
 Mode restreint. Fonctionne comme si l'exécutable commençait par la lettre 'r'.
 .TP
diff --git a/runtime/doc/manpages/it/evim-it.1 b/runtime/doc/manpages/it/evim-it.1
deleted file mode 100644
index f96d0cb42c..0000000000
--- a/runtime/doc/manpages/it/evim-it.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH EVIM 1 "16 febbraio 2002 "
-.SH NOME
-evim \- Vim "facile", Vim impostato in modo da poter essere usato
-facilmente per modificare file, anche da chi non abbia familiarità
-con i comandi.
-.SH SINTASSI
-.br
-.B evim
-[opzioni] [file ..]
-.br
-.B eview
-.SH DESCRIZIONE
-.B evim
-Inizia
-.B Vim
-e imposta le opzioni per farlo comportare come un editore "modeless".
-State sempre usando Vim, ma come un editore "posizionati-e-clicca".
-Simile all'uso di Notepad in MS-Windows.
-.B evim
-richiede la presenza della GUI, per avere a disposizione menù e barra
-strumenti.
-.PP
-Da usarsi soltanto se non si è in grado di lavorare con Vim nella
-maniera usuale.
-La modifica file sarà molto meno efficiente.
-.PP
-.B eview
-come sopra, ma parte in modalità "Sola Lettura".  Funziona come evim \-R.
-.PP
-Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc.
-.PP
-L'opzione 'insertmode' è impostata per poter immettere del testo direttamente.
-.br
-Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i
-familiari tasti usati sotto MS-Windows.
-CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo.
-Usate CTRL-Q per ottenere quello che si otterrebbe con CTRL-V in Vim nativo.
-.SH OPZIONI
-Vedere vim(1).
-.SH FILE
-.TP 15
-/usr/local/lib/vim/evim.vim
-Lo script caricato per inizializzare eVim.
-.SH NAC [NOTO ANCHE COME]
-Noto Anche Come "Vim per semplici".
-Quando usate evim si suppone che prendiate un fazzoletto,
-facciate un nodo ad ogni angolo e ve lo mettiate in testa.
-.SH VEDERE ANCHE
-vim(1)
-.SH AUTORE
-Buona parte di
-.B Vim
-è stato scritto da Bram Moolenaar, con molto aiuto da altri.
-Vedere il menù "Aiuto/Crediti".
diff --git a/runtime/doc/manpages/it/vim-it.1 b/runtime/doc/manpages/it/vim-it.1
index 51e7e043da..4d17025dc3 100644
--- a/runtime/doc/manpages/it/vim-it.1
+++ b/runtime/doc/manpages/it/vim-it.1
@@ -22,8 +22,6 @@ vim \- VI Migliorato, un editor di testi per programmatori
 .br
 .B gvim
 .B gview
-.B evim
-.B eview
 .br
 .B rvim
 .B rview
@@ -118,11 +116,6 @@ La versione GUI [Graphical User Interface].
 Apre una nuova finestra.
 Si può invocare il Modo GUI anche con l'argomento "\-g".
 .TP
-evim eview
-La versione GUI in Modo Easy (semplificata).
-Apre una nuova finestra.
-Si può invocare il Modo Easy anche con l'argomento "\-y".
-.TP
 rvim rview rgvim rgview
 Come sopra, ma con restrizioni ai comandi.  Non si potranno eseguire comandi
 della shell o sospendere
@@ -405,15 +398,6 @@ una chiave di cifratura.
 Non connetterti al server X.  Vim parte più rapidamente,
 ma il titolo della finestra e la clipboard non sono disponibili.
 .TP
-\-y
-Eseguire
-.B Vim
-in Modo Easy (semplificata), come se l'eseguibile invocato
-sia "evim" o "eview".
-Fa sì che
-.B Vim
-si comporti come un editor che usa solo il mouse e i caratteri.
-.TP
 \-Z
 Modo ristretto.  Vim si comporta come se invocato con un nome
 che inizia per "r".
diff --git a/runtime/doc/manpages/ja/evim-ja.1 b/runtime/doc/manpages/ja/evim-ja.1
deleted file mode 100644
index 1b7a657ebc..0000000000
--- a/runtime/doc/manpages/ja/evim-ja.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH EVIM 1 "2002 February 16"
-.SH 名前
-evim \- easy Vim, モードレスエディタ Vim
-.SH 書式
-.br
-.B evim
-[options] [file ..]
-.br
-.B eview
-.SH 説明
-.B eVim
-は
-.B Vim
-を起動して、モードレスエディタとして動作するためのオプションを設定します。
-Vim の動作が point-and-click エディタのような動作になります。
-MS-Windows のメモ帳のような動作です。
-.B eVim
-は常に GUI で起動し、メニューとツールバーを表示します。
-.PP
-どうしても Vim の操作に馴染めない場合に使ってください。
-編集効率は下がります。
-.PP
-.B eview
-は同様に、読み込み専用モードで起動します。evim \-R と同じです。
-.PP
-引数や Vim についての詳細は vim(1) を参照してください。
-.PP
-オプション 'insertmode' が設定され、テキストを直接、入力できるようになりま
-す。
-.br
-コピーとペーストのキー操作が MS-Windows と同じになるように、マップが設定され
-ます。
-CTRL-X が切り取り、CTRL-C がコピー、CTRL-V がペーストです。
-標準の CTRL-V の操作は CTRL-Q に割り当てられます。
-.SH オプション
-vim(1) を参照してください。
-.SH ファイル
-.TP 15
-/usr/local/lib/vim/evim.vim
-eVim の初期化スクリプト。
-.SH 別名
-evim は "gumbies のための Vim" とも呼ばれています。
-evim を使っているあなたはきっと、頭にハンカチをかぶっているのです。
-(訳注: gumbies は Monty Python に登場するおもしろ集団。ハンカチをかぶっ
-ている。)
-.SH 関連項目
-vim(1)
-.SH 著者
-.B Vim
-のほとんどの機能は Bram Moolenaar が開発し、多くの人が協力しました。
-メニューの Help/Credits を参照してください。
diff --git a/runtime/doc/manpages/ja/vim-ja.1 b/runtime/doc/manpages/ja/vim-ja.1
index a4788b3c48..714ad0ae78 100644
--- a/runtime/doc/manpages/ja/vim-ja.1
+++ b/runtime/doc/manpages/ja/vim-ja.1
@@ -22,8 +22,6 @@ vim \- Vi IMproved, プログラマのテキストエディタ
 .br
 .B gvim
 .B gview
-.B evim
-.B eview
 .br
 .B rvim
 .B rview
@@ -108,11 +106,6 @@ GUI バージョン。
 新しいウィンドウを開いて起動します。
 引数に "\-g" を指定した場合と同じです。
 .TP
-evim eview
-簡易モードの GUI バージョン。
-新しいウィンドウを開いて起動します。
-引数に "\-y" を指定した場合と同じです。
-.TP
 rvim rview rgvim rgview
 上記と同じですが、制限モードで起動します。シェルコマンドを実行したり、
 .B Vim
@@ -349,12 +342,6 @@ Vi モードで起動します。
 X サーバーと通信しません。端末での起動時間を短くできます。
 しかし、ウィンドウタイトルの変更やクリップボードは使えなくなります。
 .TP
-\-y
-簡易モードで起動します。
-実行ファイルの名前が "evim" や "eview" の場合と同じです。
-.B Vim
-の動作がモードレスエディタ (click-and-type editor) のようになります。
-.TP
 \-Z
 制限モード。
 実行ファイルの名前が "r" で始まっている場合と同じです。
diff --git a/runtime/doc/manpages/pl/evim-pl.1 b/runtime/doc/manpages/pl/evim-pl.1
deleted file mode 100644
index 096a12add2..0000000000
--- a/runtime/doc/manpages/pl/evim-pl.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.TH EVIM 1 "2002 Lut 16"
-.SH NAZWA
-evim \- łatwy Vim, edytuj plik w Vimie z ustawieniami dla edycji bez
-trybów
-.SH SYNOPSIS
-.br
-.B evim
-[opcje] [plik ...]
-.br
-.B eview
-.SH OPIS
-.B eVim
-uruchamia
-.B Vima
-i ustawia opcje tak by zachowywał się jak edytor bez trybów.
-To jest cały czas Vim ale używany jako edytor wskaż-i-kliknij.
-Zachowanie w stylu Notepada dla MS-Windows.
-.B eVim
-będzie zawsze uruchomiony w GUI by włączyć menu i pasek narzędzi.
-.PP
-Przeznaczony tylko dla ludzi, którzy naprawdę nie mogą pracować
-z Vimem w normalny sposób. Edycja będzie o wiele mniej efektywna.
-.PP
-.B eview
-działa tak samo, ale zaczyna w trybie tylko do odczytu. Działa tak
-samo jak evim \-R.
-.PP
-Zobacz vim(1) by poznać więcej szczegółów o Vimie, opcjach, itd.
-.PP
-Opcja 'insertmode' jest ustawiona by można było od razu wpisywać
-tekst.
-.br
-Mapowania są ustawione tak by Kopiowanie i Wklejanie działało
-z klawiszami MS-Windows. CTRL-X wycina, CTRL-C kopiuje a CTRL-V 
-wkleja tekst. Użyj CTRL-Q by uzyskać oryginalne przeznaczenie
-CTRL-V.
-.SH OPCJE
-Zobacz vim(1).
-.SH PLIKI
-.TP 15
-/usr/local/lib/vim/evim.vim
-Skrypt uruchamiania dla eVima.
-.SH ZNANY JAKO
-Znany jako "Vim dla frajerów".
-Jeśli używasz eVima oczekuje się, że wyjmiesz chusteczkę do nosa,
-zrobisz węzęł w każdym rogu i będziesz to nosił na głowie.
-.SH ZOBACZ TAKŻE
-vim(1)
-.SH AUTOR
-Większość 
-.B Vima
-została napisana przez Brama Moolenaara z dużą pomocą innych osób.
-Zobacz menu Help/Credits.
diff --git a/runtime/doc/manpages/pl/vim-pl.1 b/runtime/doc/manpages/pl/vim-pl.1
index f3551d2f63..97d28f3a78 100644
--- a/runtime/doc/manpages/pl/vim-pl.1
+++ b/runtime/doc/manpages/pl/vim-pl.1
@@ -22,8 +22,6 @@ vim \- Vi rozbudowany, edytor tekstu dla programisty
 .br
 .B gvim
 .B gview
-.B evim
-.B eview
 .br
 .B rvim
 .B rview
@@ -119,11 +117,6 @@ Wersja GUI.
 Uruchamia nowe okno.
 Można także uruchomić poprzez argument "\-g".
 .TP
-evim eview
-Wersja GUI w łatwym trybie.
-Uruchamia nowe okno.
-Można także uruchomić poprzez argument "\-y".
-.TP
 rvim rview rgvim rgview
 Podobnie jak powyżej, ale z ograniczeniami. Nie będzie można uruchomić
 poleceń powłoki lub zawiesić
@@ -403,13 +396,6 @@ o podanie klucza.
 Nie łącz z serwerem X. Skraca czas uruchamiania w terminalu, ale tytuł
 okna i schowek nie będą wykorzystywane.
 .TP
-\-y
-Uruchom
-.B Vima
-w łatwym trybie, tak jakby program został wywołany "evim" lub "eview".
-.B Vim
-będzie zachowywał się bardziej jak edytor kliknij-i-wpisz.
-.TP
 \-Z
 Tryb ograniczony. Zachowuje się jakby nazwa programu zaczynała się od
 "r".
diff --git a/runtime/doc/manpages/ru/evim-ru.1 b/runtime/doc/manpages/ru/evim-ru.1
deleted file mode 100644
index 581c364c22..0000000000
--- a/runtime/doc/manpages/ru/evim-ru.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.TH EVIM 1 "2002 February 16"
-.SH ИМЯ
-evim \- простой Vim, позволяет редактировать файл с помощью Vim в безрежимном режиме
-.SH КОМАНДНАЯ СТРОКА
-.br
-.B evim
-[ключи] [файл ..]
-.br
-.B eview
-.SH ОПИСАНИЕ
-Команда
-.B evim
-запускает
-.B Vim
-и настраивает ряд опций таким образом, что он начинает вести себя
-как обычный безрежимный редактор. В этом режиме Vim напоминает
-Notepad из MS-Windows.
-.B eVim
-всегда запускается с поддержкой графического интерфейса, чтобы обеспечить
-использование меню и инструментальной панели.
-.PP
-Эта команда создана для тех, кто по каким-то причинам не в состоянии 
-работать с Vim в обычном режиме. Редактирование файлов при этом происходит
-гораздо менее эффективно, чем при использовании обычного Vim.
-.PP
-Команда
-.B eview
-выполняет почти ту же самую задачу, но файл открывается в режиме "только
-для чтения". Использование этой команды полностью идентично использованию 
-evim \-R.
-.PP
-Подробнее о Vim, ключах запуска и т.п. смотрите на странице справочника 
-vim(1).
-.PP
-При использовании
-.B evim
-включается опция 'insertmode', что позволяет вводить текст напрямую.
-.br
-Кроме того, настраиваются привязки, позволяющие использовать кнопки MS-Windows
-для выполнения команд копирования и вклейки. CTRL-X используется для вырезания 
-текста, CTRL-C для копирования и CTRL-V для вклейки. Чтобы воспользоваться
-изначальным значением кнопки CTRL-V, используйте CTRL-Q.
-.SH ПАРАМЕТРЫ ЗАПУСКА
-См. vim(1).
-.SH ФАЙЛЫ
-.TP 15
-/usr/local/lib/vim/evim.vim
-Сценарий, который загружается для инициализации eVim.
-.SH AKA
-eVim также известен как "Vim для чайников".
-Для наилучшего эффекта рекомендуется во время использования повязать
-на голове платок, предварительно завязав на каждом конце по узелку.
-.SH СМОТРИ ТАКЖЕ
-vim(1)
-.SH АВТОРЫ
-Большая часть
-.B Vim
-создана Брамом Мооленааром (Bram Moolenaar), которому помогает огромное 
-количество людей. См. меню Справка/Благодарности.
diff --git a/runtime/doc/manpages/vim.1 b/runtime/doc/manpages/vim.1
index aaf05b59be..678170f6e1 100644
--- a/runtime/doc/manpages/vim.1
+++ b/runtime/doc/manpages/vim.1
@@ -22,8 +22,6 @@ vim \- Vi IMproved, a programmers text editor
 .br
 .B gvim
 .B gview
-.B evim
-.B eview
 .br
 .B rvim
 .B rview
@@ -115,11 +113,6 @@ The GUI version.
 Starts a new window.
 Can also be done with the "\-g" argument.
 .TP
-evim eview
-The GUI version in easy mode.
-Starts a new window.
-Can also be done with the "\-y" argument.
-.TP
 rvim rview rgvim rgview
 Like the above, but with restrictions.  It will not be possible to start shell
 commands, or suspend
@@ -388,14 +381,6 @@ Like \-w, but an existing file is overwritten.
 Don't connect to the X server.  Shortens startup time in a terminal, but the
 window title and clipboard will not be used.
 .TP
-\-y
-Start
-.B Vim
-in easy mode, just like the executable was called "evim" or "eview".
-Makes
-.B Vim
-behave like a click-and-type editor.
-.TP
 \-Z
 Restricted mode.  Works like the executable starts with "r".
 .TP
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 8152c3d3c4..d24b02149d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4233,7 +4233,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 	Makes Vim work in a way that Insert mode is the default mode.  Useful
-	if you want to use Vim as a modeless editor.  Used for |evim|.
+	if you want to use Vim as a modeless editor.
 	These Insert mode commands will be useful:
 	- Use the cursor keys to move around.
 	- Use CTRL-O to execute one Normal mode command |i_CTRL-O|).  When
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 0c0b02e591..502d122a7c 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.4.  Last change: 2014 Jul 09
+*starting.txt*  For Vim version 7.4.  Last change: 2015 Jan 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -7,13 +7,12 @@
 Starting Vim						*starting*
 
 1. Vim arguments		|vim-arguments|
-2. Running eVim			|evim-keys|
-3. Initialization		|initialization|
-4. $VIM and $VIMRUNTIME		|$VIM|
-5. Suspending			|suspend|
-6. Saving settings		|save-settings|
-7. Views and Sessions		|views-sessions|
-8. The viminfo file		|viminfo-file|
+2. Initialization		|initialization|
+3. $VIM and $VIMRUNTIME		|$VIM|
+4. Suspending			|suspend|
+5. Saving settings		|save-settings|
+6. Views and Sessions		|views-sessions|
+7. The viminfo file		|viminfo-file|
 
 ==============================================================================
 1. Vim arguments					*vim-arguments*
@@ -100,8 +99,6 @@ rvim	vim -Z	    Like "vim", but in restricted mode (see |-Z|)   *rvim*
 rview	vim -RZ	    Like "view", but in restricted mode.	  *rview*
 rgvim	vim -gZ	    Like "gvim", but in restricted mode.	  *rgvim*
 rgview	vim -RgZ    Like "gview", but in restricted mode.	  *rgview*
-evim    vim -y      Easy Vim: set 'insertmode' (see |-y|)	    *evim*
-eview   vim -yR     Like "evim" in read-only mode		  *eview*
 vimdiff vim -d	    Start in diff mode |diff-mode|
 gvimdiff vim -gd    Start in diff mode |diff-mode|
 
@@ -353,14 +350,6 @@ argument.
 		or when using "-u NONE".
 		Also see |compatible-default|.  {not in Vi}
 
-							*-y* *easy*
--y		Easy mode.  Implied for |evim| and |eview|.  Starts with
-		'insertmode' set and behaves like a click-and-type editor.
-		This sources the script $VIMRUNTIME/evim.vim.  Mappings are
-		set up to work like most click-and-type editors, see
-		|evim-keys|.  The GUI is started when available.
-		{not in Vi}
-
 							*-n*
 -n		No swap file will be used.  Recovery after a crash will be
 		impossible.  Handy if you want to view or edit a file on a
@@ -588,58 +577,6 @@ Additional arguments are available on unix like systems when compiled with
 X11 GUI support.  See |gui-resources|.
 
 ==============================================================================
-2. Running eVim							*evim-keys*
-
-EVim runs Vim as click-and-type editor.  This is very unlike the original Vi
-idea.  But it helps for people that don't use Vim often enough to learn the
-commands.  Hopefully they will find out that learning to use Normal mode
-commands will make their editing much more effective.
-
-In Evim these options are changed from their default value:
-
-	:set nocompatible	Use Vim improvements
-	:set insertmode		Remain in Insert mode most of the time
-	:set hidden		Keep invisible buffers loaded
-	:set backup		Keep backup files
-	:set backspace=2	Backspace over everything
-	:set autoindent		auto-indent new lines
-	:set history=50		keep 50 lines of Ex commands
-	:set ruler		show the cursor position
-	:set incsearch		show matches halfway typing a pattern
-	:set mouse=a		use the mouse in all modes
-	:set hlsearch		highlight all matches for a search pattern
-	:set whichwrap+=<,>,[,]  <Left> and <Right> wrap around line breaks
-	:set guioptions-=a	non-Unix only: don't do auto-select
-
-Key mappings:
-	<Down>		moves by screen lines rather than file lines
-	<Up>		idem
-	Q		does "gq", formatting, instead of Ex mode
-	<BS>		in Visual mode: deletes the selection
-	CTRL-X		in Visual mode: Cut to clipboard
-	<S-Del>		idem
-	CTRL-C		in Visual mode: Copy to clipboard
-	<C-Insert>	idem
-	CTRL-V		Pastes from the clipboard (in any mode)
-	<S-Insert>	idem
-	CTRL-Q		do what CTRL-V used to do
-	CTRL-Z		undo
-	CTRL-Y		redo
-	<M-Space>	system menu
-	CTRL-A		select all
-	<C-Tab>		next window, CTRL-W w
-	<C-F4>		close window, CTRL-W c
-
-Additionally:
-- ":behave mswin" is used |:behave|
-- syntax highlighting is enabled
-- filetype detection is enabled, filetype plugins and indenting is enabled
-- in a text file 'textwidth' is set to 78
-
-One hint: If you want to go to Normal mode to be able to type a sequence of
-commands, use CTRL-L. |i_CTRL-L|
-
-==============================================================================
 3. Initialization				*initialization* *startup*
 
 This section is about the non-GUI version of Vim.  See |gui-fork| for
@@ -693,11 +630,8 @@ accordingly.  Vim proceeds in this order:
 	If Vim was started in Ex mode with the "-s" argument, all following
 	initializations until 4. are skipped.  Only the "-u" option is
 	interpreted.
-							*evim.vim*
-     a. If vim was started as |evim| or |eview| or with the |-y| argument, the
-	script $VIMRUNTIME/evim.vim will be loaded.
 							*system-vimrc*
-     b. For Unix, MS-DOS, MS-Windows, and Macintosh, the system vimrc file is
+     a. For Unix, MS-DOS, MS-Windows, and Macintosh, the system vimrc file is
 	read for initializations.  The path of this file is shown with the
 	":version" command.  Mostly it's "$VIM/vimrc".
 	Note that this file is ALWAYS read in 'compatible' mode, since the
@@ -706,7 +640,7 @@ accordingly.  Vim proceeds in this order:
 	For the Macintosh the $VIMRUNTIME/macmap.vim is read.
 
 	  *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* *$MYVIMRC*
-     c. Four places are searched for initializations.  The first that exists
+     b. Four places are searched for initializations.  The first that exists
 	is used, the others are ignored.  The $MYVIMRC environment variable is
 	set to the file that was first found, unless $MYVIMRC was already set
 	and when using VIMINIT.
@@ -731,7 +665,7 @@ accordingly.  Vim proceeds in this order:
 	   "vimrc" replaced by "exrc".  But only one of ".exrc" and "_exrc" is
 	   used, depending on the system.  And without the (*)!
 
-     d. If the 'exrc' option is on (which is not the default), the current
+     c. If the 'exrc' option is on (which is not the default), the current
 	directory is searched for three files.  The first that exists is used,
 	the others are ignored.
 	-  The file ".vimrc" (for Unix) (*)
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index df76542c6e..c7b1910358 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -94,14 +94,6 @@ back on.
 
 For more info see |vimrc| and |compatible-default|.
 
-	Note:
-	This manual is about using Vim in the normal way.  There is an
-	alternative called "evim" (easy Vim).  This is still Vim, but used in
-	a way that resembles a click-and-type editor like Notepad.  It always
-	stays in Insert mode, thus it feels very different.  It is not
-	explained in the user manual, since it should be mostly self
-	explanatory.  See |evim-keys| for details.
-
 ==============================================================================
 *01.3*	Using the Vim tutor				*tutor* *vimtutor*
 
diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt
index 38e5886fa0..3579e1f430 100644
--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -434,8 +434,6 @@ someone supplied, you can't do this.  Do delete the files manually, here is an
 example for when "/usr/local" was used as the root: >
 
 	rm -rf /usr/local/share/vim/vim61
-	rm /usr/local/bin/eview
-	rm /usr/local/bin/evim
 	rm /usr/local/bin/ex
 	rm /usr/local/bin/gview
 	rm /usr/local/bin/gvim
@@ -451,8 +449,6 @@ example for when "/usr/local" was used as the root: >
 	rm /usr/local/bin/vimdiff
 	rm /usr/local/bin/vimtutor
 	rm /usr/local/bin/xxd
-	rm /usr/local/man/man1/eview.1
-	rm /usr/local/man/man1/evim.1
 	rm /usr/local/man/man1/ex.1
 	rm /usr/local/man/man1/gview.1
 	rm /usr/local/man/man1/gvim.1
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 66cc9c0412..9ce94696e4 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -919,8 +919,6 @@ Only Vim is able to accept options in between and after the file names.
 
 -X		Vim: Don't connect to the X server.
 
--y		Vim: Start in easy mode, like |evim|.
-
 -Z		Vim: restricted mode
 
 @{cmdfile}	Vile: use {cmdfile} as startup file.
diff --git a/runtime/evim.vim b/runtime/evim.vim
deleted file mode 100644
index e35f1be085..0000000000
--- a/runtime/evim.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim script for Evim key bindings
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Mar 29
-
-" Don't use Vi-compatible mode.
-set nocompatible
-
-" Use the mswin.vim script for most mappings
-source <sfile>:p:h/mswin.vim
-
-" Vim is in Insert mode by default
-set insertmode
-
-" Make a buffer hidden when editing another one
-set hidden
-
-" Make cursor keys ignore wrapping
-inoremap <silent> <Down> <C-R>=pumvisible() ? "\<lt>Down>" : "\<lt>C-O>gj"<CR>
-inoremap <silent> <Up> <C-R>=pumvisible() ? "\<lt>Up>" : "\<lt>C-O>gk"<CR>
-
-" CTRL-F does Find dialog instead of page forward
-noremap <silent> <C-F> :promptfind<CR>
-vnoremap <silent> <C-F> y:promptfind <C-R>"<CR>
-onoremap <silent> <C-F> <C-C>:promptfind<CR>
-inoremap <silent> <C-F> <C-O>:promptfind<CR>
-cnoremap <silent> <C-F> <C-C>:promptfind<CR>
-
-
-set backspace=2		" allow backspacing over everything in insert mode
-set autoindent		" always set autoindenting on
-set backup		" keep a backup file
-set history=50		" keep 50 lines of command line history
-set ruler		" show the cursor position all the time
-set incsearch		" do incremental searching
-set mouse=a		" always use the mouse
-
-" Don't use Ex mode, use Q for formatting
-map Q gq
-
-" Switch syntax highlighting on, when the terminal has colors
-" Highlight the last used search pattern on the next search command.
-if &t_Co > 2 || has("gui_running")
-  syntax on
-  set hlsearch
-  nohlsearch
-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
-
-  " For all text files set 'textwidth' to 78 characters.
-  au FileType text setlocal tw=78
-
-endif " has("autocmd")
-
-" vim: set sw=2 :
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index 11656f2d5d..7d64d99bf7 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -7,11 +7,6 @@
 "     for Unix:  ~/.vimrc
 "     for MS-DOS and Win32:  $VIM\_vimrc
 
-" When started as "evim", evim.vim will already have done these settings.
-if v:progname =~? "evim"
-  finish
-endif
-
 " Use Vim settings, rather than Vi settings (much better!).
 " This must be first, because it changes other options as a side effect.
 set nocompatible
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 05b9778102..0b0948373a 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -82,7 +82,6 @@ typedef struct {
   int argc;
   char        **argv;
 
-  int evim_mode;                        /* started as "evim" */
   char_u      *use_vimrc;               /* vimrc from -u argument */
 
   int n_commands;                            /* no. of commands from + or -c */
@@ -888,9 +887,8 @@ static void init_locale(void)
 #endif
 
 /*
- * Check for: [r][e][g][vi|vim|view][diff][ex[im]]
+ * Check for: [r][g][vi|vim|view][diff][ex[im]]
  * If the executable name starts with "r" we disable shell commands.
- * If the next character is "e" we run in Easy mode.
  * If the next character is "g" we run the GUI version.
  * If the next characters are "view" we start in readonly mode.
  * If the next characters are "diff" or "vimdiff" we start in diff mode.
@@ -913,9 +911,6 @@ static void parse_command_name(mparm_T *parmp)
   if (parse_char_i(&initstr, 'r'))
     restricted = TRUE;
 
-  if (parse_char_i(&initstr, 'e'))
-    parmp->evim_mode = TRUE;
-
   /* "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows. */
   if (parse_char_i(&initstr, 'g'))
     main_start_gui();
@@ -1113,10 +1108,6 @@ static void command_line_scan(mparm_T *parmp)
           p_write = FALSE;
           break;
 
-        case 'y':                 /* "-y"  easy mode */
-          parmp->evim_mode = TRUE;
-          break;
-
         case 'N':                 /* "-N"  Nocompatible */
           /* No-op */
           break;
@@ -1896,15 +1887,6 @@ static void source_startup_scripts(mparm_T *parmp)
   int i;
 
   /*
-   * For "evim" source evim.vim first of all, so that the user can overrule
-   * any things he doesn't like.
-   */
-  if (parmp->evim_mode) {
-    (void)do_source((char_u *)EVIM_FILE, FALSE, DOSO_NONE);
-    TIME_MSG("source evim file");
-  }
-
-  /*
    * If -u argument given, use only the initializations from that file and
    * nothing else.
    */
@@ -2155,7 +2137,6 @@ static void usage(void)
   main_msg(_("-E\t\t\tImproved Ex mode"));
   main_msg(_("-s\t\t\tSilent (batch) mode (only for \"ex\")"));
   main_msg(_("-d\t\t\tDiff mode (like \"vimdiff\")"));
-  main_msg(_("-y\t\t\tEasy mode (like \"evim\", modeless)"));
   main_msg(_("-R\t\t\tReadonly mode (like \"view\")"));
   main_msg(_("-Z\t\t\tRestricted mode (like \"rvim\")"));
   main_msg(_("-m\t\t\tModifications (writing files) not allowed"));
diff --git a/src/nvim/os_unix_defs.h b/src/nvim/os_unix_defs.h
index adea2ad22f..40230c7944 100644
--- a/src/nvim/os_unix_defs.h
+++ b/src/nvim/os_unix_defs.h
@@ -153,10 +153,6 @@
 #endif
 
 
-#ifndef EVIM_FILE
-# define EVIM_FILE      "$VIMRUNTIME/evim.vim"
-#endif
-
 # ifndef VIMINFO_FILE
 #   define VIMINFO_FILE "$HOME/.nviminfo"
 # endif