99 files changed, 669 insertions, 6206 deletions
diff --git a/.gitignore b/.gitignore
index 4a6bbfec0f..5332ef5c76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,11 @@
 # local make targets
 local.mk
 
+# runtime/doc
+/runtime/doc/*.html
+/runtime/doc/**/*.man
+/runtime/doc/tags
+/runtime/doc/tags.ref
+/runtime/doc/doctags
+/runtime/doc/errors.log
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb680da902..3622dabb23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,12 +119,13 @@ endif()
 
 message(STATUS "Using the Lua interpreter ${LUA_PRG}")
 
-add_subdirectory(config)
-add_subdirectory(src/nvim)
-add_subdirectory(test/includes)
-
+# Setup busted.
 find_program(BUSTED_PRG busted)
+if(NOT BUSTED_OUTPUT_TYPE)
+  set(BUSTED_OUTPUT_TYPE "utfTerminal")
+endif()
 
+# Setup make.
 find_program(MAKE_PRG NAMES gmake make)
 if(MAKE_PRG)
   execute_process(
@@ -146,10 +147,47 @@ if(CMAKE_GENERATOR MATCHES "Makefiles")
   set(MAKE_PRG "$(MAKE)")
 endif()
 
-if(NOT BUSTED_OUTPUT_TYPE)
-  set(BUSTED_OUTPUT_TYPE "utfTerminal")
-endif()
+# CMake is painful here.  It will create the destination using the user's
+# current umask, and we don't want that.  And we don't just want to install
+# the target directory, as it will mess with existing permissions.  So this
+# seems like the best compromise.  If we create it, then everyone can see it.
+# If it's preexisting, leave it alone.
+include(InstallHelpers)
+
+install_helper(
+  DIRECTORY runtime
+  DESTINATION share/nvim)
+
+file(GLOB_RECURSE RUNTIME_PROGRAMS
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  runtime/*.pl runtime/*.awk runtime/*.sh
+  runtime/tools/ref
+  runtime/tools/vimm)
+
+foreach(PROG ${RUNTIME_PROGRAMS})
+  get_filename_component(BASEDIR ${PROG} PATH)
+  install_helper(PROGRAMS ${PROG} DESTINATION share/nvim/${BASEDIR})
+endforeach()
+
+install(SCRIPT ${CMAKE_MODULE_PATH}/GenerateHelptags.cmake)
+
+# Unfortunately, the below does not work under Ninja.  Ninja doesn't use a
+# pseudo-tty when launching processes, because it can put many jobs in parallel
+# and eat-up all the available pseudo-ttys.  Unfortunately, that doesn't work
+# well with the legacy tests.  I have a branch that converts them to run under
+# CTest, but it needs a little more work.
+# add_custom_target(test
+#   COMMAND ${MAKE_PRG} -C ${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/testdir
+#     VIMPROG=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/nvim)
+
+# Go down the tree.
 
+add_subdirectory(config)
+add_subdirectory(src/nvim)
+add_subdirectory(test/includes)
+
+# Setup some test-related bits.  We do this after going down the tree because we
+# need some of the targets.
 if(BUSTED_PRG)
   get_property(TEST_INCLUDE_DIRS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     PROPERTY INCLUDE_DIRECTORIES)
@@ -176,15 +214,3 @@ if(BUSTED_PRG)
       -P ${CMAKE_MODULE_PATH}/RunUnittests.cmake
     DEPENDS nvim-test unittest-headers)
 endif()
-
-install(DIRECTORY runtime DESTINATION share/nvim)
-install(SCRIPT ${CMAKE_MODULE_PATH}/GenerateHelptags.cmake)
-
-# Unfortunately, the below does not work under Ninja.  Ninja doesn't use a
-# pseudo-tty when launching processes, because it can put many jobs in parallel
-# and eat-up all the available pseudo-ttys.  Unfortunately, that doesn't work
-# well with the legacy tests.  I have a branch that converts them to run under
-# CTest, but it needs a little more work.
-# add_custom_target(test
-#   COMMAND ${MAKE_PRG} -C ${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/testdir
-#     VIMPROG=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/nvim)
diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake
new file mode 100644
index 0000000000..de2f970cc1
--- /dev/null
+++ b/cmake/InstallHelpers.cmake
@@ -0,0 +1,136 @@
+# This will create any directories that need to be created in the destination
+# path with the typical owner, group, and user permissions--independent of the
+# umask setting.
+function(create_install_dir_with_perms)
+  cmake_parse_arguments(_install_dir
+    ""
+    "DESTINATION"
+    "DIRECTORY_PERMISSIONS"
+    ${ARGN}
+  )
+
+  if(NOT _install_dir_DESTINATION)
+    message(FATAL_ERROR "Must specify DESTINATION")
+  endif()
+
+  if(NOT _install_dir_DIRECTORY_PERMISSIONS)
+    set(_install_dir_DIRECTORY_PERMISSIONS
+      OWNER_READ OWNER_WRITE OWNER_EXECUTE
+      GROUP_READ GROUP_EXECUTE
+      WORLD_READ WORLD_EXECUTE)
+  endif()
+
+  install(CODE
+    "
+    if(ENV{DESTDIR})
+      set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX})
+    else()
+      set(PREFIX \${CMAKE_INSTALL_PREFIX})
+    endif()
+
+    set(_current_dir \"\${PREFIX}/${_install_dir_DESTINATION}\")
+    set(_dir_permissions \"${_install_dir_DIRECTORY_PERMISSIONS}\")
+
+    set(_parent_dirs)
+    while(NOT EXISTS \${_current_dir})
+      list(APPEND _parent_dirs \${_current_dir})
+      get_filename_component(_current_dir \${_current_dir} PATH)
+    endwhile()
+
+    if(_parent_dirs)
+      list(REVERSE _parent_dirs)
+    endif()
+
+    # Create any missing folders with the useful permissions.  Note: this uses
+    # a hidden option of CMake, but it's been shown to work with 2.8.11 thru
+    # 3.0.2.
+    foreach(_current_dir \${_parent_dirs})
+      if(NOT IS_DIRECTORY \${_current_dir})
+        file(INSTALL DESTINATION \${_current_dir}
+          TYPE DIRECTORY
+          DIR_PERMISSIONS \${_dir_permissions}
+          FILES \"\")
+      endif()
+    endforeach()
+    ")
+endfunction()
+
+# This is to prevent the user's umask from corrupting the expected permissions
+# for the parent directories.  We want to behave like the install tool here:
+# preserve what's there already, but create new things with useful permissions.
+function(install_helper)
+  cmake_parse_arguments(_install_helper
+    ""
+    "DESTINATION;DIRECTORY;RENAME"
+    "FILES;PROGRAMS;TARGETS;DIRECTORY_PERMISSIONS;FILE_PERMISSIONS"
+    ${ARGN}
+  )
+
+  if(NOT _install_helper_DESTINATION AND NOT _install_helper_TARGETS)
+    message(FATAL_ERROR "Must specify the DESTINATION path")
+  endif()
+
+  if(NOT _install_helper_FILES AND NOT _install_helper_DIRECTORY AND
+     NOT _install_helper_PROGRAMS AND NOT _install_helper_TARGETS)
+    message(FATAL_ERROR "Must specify FILES, PROGRAMS, TARGETS, or a DIRECTORY to install")
+  endif()
+
+  if(NOT _install_helper_DIRECTORY_PERMISSIONS)
+    set(_install_helper_DIRECTORY_PERMISSIONS
+      OWNER_READ OWNER_WRITE OWNER_EXECUTE
+      GROUP_READ GROUP_EXECUTE
+      WORLD_READ WORLD_EXECUTE)
+  endif()
+
+  if(NOT _install_helper_FILE_PERMISSIONS)
+    set(_install_helper_FILE_PERMISSIONS
+      OWNER_READ OWNER_WRITE
+      GROUP_READ
+      WORLD_READ)
+  endif()
+
+  if(_install_helper_RENAME)
+    set(RENAME RENAME ${_install_helper_RENAME})
+  endif()
+
+  if(_install_helper_TARGETS)
+    set(_install_helper_DESTINATION "")
+  endif()
+
+  if(_install_helper_TARGETS)
+    # Ensure the bin area exists with the correct permissions.
+    create_install_dir_with_perms(DESTINATION bin)
+
+    install(
+      TARGETS ${_install_helper_TARGETS}
+      RUNTIME DESTINATION bin)
+  else()
+    create_install_dir_with_perms(
+      DESTINATION ${_install_helper_DESTINATION}
+      DIRECTORY_PERMISSIONS ${_install_helper_DIRECTORY_PERMISSIONS})
+  endif()
+
+  if(_install_helper_DIRECTORY)
+    install(
+      DIRECTORY ${_install_helper_DIRECTORY}
+      DESTINATION ${_install_helper_DESTINATION}
+      DIRECTORY_PERMISSIONS ${_install_helper_DIRECTORY_PERMISSIONS}
+      FILE_PERMISSIONS ${_install_helper_FILE_PERMISSIONS})
+  endif()
+
+  if(_install_helper_FILES)
+    install(
+      FILES ${_install_helper_FILES}
+      DESTINATION ${_install_helper_DESTINATION}
+      PERMISSIONS ${_install_helper_FILE_PERMISSIONS}
+      ${RENAME})
+  endif()
+
+  if(_install_helper_PROGRAMS)
+    install(
+      PROGRAMS ${_install_helper_PROGRAMS}
+      DESTINATION ${_install_helper_DESTINATION}
+      PERMISSIONS ${_install_helper_FILE_PERMISSIONS}
+      ${RENAME})
+  endif()
+endfunction()
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 8bd5aaf049..16ce4d9082 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -9,10 +9,6 @@ AWK = awk
 # Set to $(VIMTARGET) when executed from src/Makefile.
 VIMEXE = vim
 
-# include the config.mk from the source directory.  It's only needed to set
-# AWK, used for "make html".  Comment this out if the include gives problems.
-include ../../src/auto/config.mk
-
 DOCS = \
 	arabic.txt \
 	autocmd.txt \
@@ -34,7 +30,6 @@ DOCS = \
 	gui_w16.txt \
 	gui_w32.txt \
 	gui_x11.txt \
-	hangulin.txt \
 	hebrew.txt \
 	help.txt \
 	helphelp.txt \
@@ -52,12 +47,17 @@ DOCS = \
 	index.txt \
 	insert.txt \
 	intro.txt \
+	job_control.txt \
 	map.txt \
 	mbyte.txt \
 	message.txt \
 	mlang.txt \
 	motion.txt \
+	msgpack_rpc.txt \
 	netbeans.txt \
+	nvim_clipboard.txt \
+	nvim_intro.txt \
+	nvim_python.txt \
 	options.txt \
 	os_390.txt \
 	os_amiga.txt \
@@ -162,7 +162,6 @@ HTMLS = \
 	gui_w16.html \
 	gui_w32.html \
 	gui_x11.html \
-	hangulin.html \
 	hebrew.html \
 	helphelp.html \
 	howto.html \
@@ -179,12 +178,17 @@ HTMLS = \
 	index.html \
 	insert.html \
 	intro.html \
+	job_control.html \
 	map.html \
 	mbyte.html \
 	message.html \
 	mlang.html \
 	motion.html \
+	msgpack_rpc.html \
 	netbeans.html \
+	nvim_clipboard.html \
+	nvim_intro.html \
+	nvim_python.html \
 	options.html \
 	os_390.html \
 	os_amiga.html \
@@ -270,32 +274,43 @@ HTMLS = \
 	windows.html \
 	workshop.html
 
-CONVERTED = \
-	vim-fr.UTF-8.1 \
-	evim-fr.UTF-8.1 \
-	vimdiff-fr.UTF-8.1 \
-	vimtutor-fr.UTF-8.1 \
-	xxd-fr.UTF-8.1 \
-	vim-it.UTF-8.1 \
-	evim-it.UTF-8.1 \
-	vimdiff-it.UTF-8.1 \
-	vimtutor-it.UTF-8.1 \
-	xxd-it.UTF-8.1 \
-	vim-pl.UTF-8.1 \
-	evim-pl.UTF-8.1 \
-	vimdiff-pl.UTF-8.1 \
-	vimtutor-pl.UTF-8.1 \
-	xxd-pl.UTF-8.1 \
-	vim-ru.UTF-8.1 \
-	evim-ru.UTF-8.1 \
-	vimdiff-ru.UTF-8.1 \
-	vimtutor-ru.UTF-8.1 \
-	xxd-ru.UTF-8.1
+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
 
 .SUFFIXES:
-.SUFFIXES: .c .o .txt .html
+.SUFFIXES: .c .o .txt .html .1 .man
 
-all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
+all: tags manpages html
 
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
@@ -310,28 +325,15 @@ tags: doctags $(DOCS)
 doctags: doctags.c
 	$(CC) doctags.c -o doctags
 
-vim.man: vim.1
-	nroff -man vim.1 | sed -e s/.//g > vim.man
-
-evim.man: evim.1
-	nroff -man evim.1 | sed -e s/.//g > evim.man
-
-vimdiff.man: vimdiff.1
-	nroff -man vimdiff.1 | sed -e s/.//g > vimdiff.man
+manpages: $(MANPAGES)
 
-vimtutor.man: vimtutor.1
-	nroff -man vimtutor.1 | sed -e s/.//g > vimtutor.man
-
-xxd.man: xxd.1
-	nroff -man xxd.1 | sed -e s/.//g > xxd.man
-
-uganda.nsis.txt: uganda.txt
-	sed -e 's/[ 	]*\*[-a-zA-Z0-9.]*\*//g' -e 's/vim:tw=78://' \
-		uganda.txt | uniq >uganda.nsis.txt
+# OSX groff dosn't support utf-8 as input encoding, so this won't work there.
+.1.man:
+	groff -k -mandoc -Tutf8 $< | sed -e s/.^H//g > $@
 
 # Awk version of .txt to .html conversion.
 html: noerrors tags $(HTMLS)
-	@if test -f errors.log; then more errors.log; fi
+	@if test -f errors.log; then cat errors.log; fi
 
 noerrors:
 	-rm -f errors.log
@@ -359,119 +361,5 @@ perlhtml: tags $(DOCS)
 	./vim2html.pl tags $(DOCS)
 
 clean:
-	-rm doctags *.html tags.ref
-
-# These files are in the extra archive, skip if not present
-
-arabic.txt:
-	touch arabic.txt
-
-farsi.txt:
-	touch farsi.txt
-
-hebrew.txt:
-	touch hebrew.txt
-
-russian.txt:
-	touch russian.txt
-
-gui_w16.txt:
-	touch gui_w16.txt
-
-gui_w32.txt:
-	touch gui_w32.txt
-
-if_ole.txt:
-	touch if_ole.txt
-
-os_390.txt:
-	touch os_390.txt
-
-os_amiga.txt:
-	touch os_amiga.txt
-
-os_beos.txt:
-	touch os_beos.txt
-
-os_dos.txt:
-	touch os_dos.txt
-
-os_mac.txt:
-	touch os_mac.txt
-
-os_mint.txt:
-	touch os_mint.txt
-
-os_os2.txt:
-	touch os_os2.txt
-
-os_qnx.txt:
-	touch os_qnx.txt
-
-os_risc.txt:
-	touch os_risc.txt
-
-os_win32.txt:
-	touch os_win32.txt
-
-# Note that $< works with GNU make while $> works for BSD make.
-# Is there a solution that works for both??
-vim-fr.UTF-8.1: vim-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-evim-fr.UTF-8.1: evim-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-vimdiff-fr.UTF-8.1: vimdiff-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-vimtutor-fr.UTF-8.1: vimtutor-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-xxd-fr.UTF-8.1: xxd-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-vim-it.UTF-8.1: vim-it.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-evim-it.UTF-8.1: evim-it.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-vimdiff-it.UTF-8.1: vimdiff-it.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-vimtutor-it.UTF-8.1: vimtutor-it.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-xxd-it.UTF-8.1: xxd-it.1
-	iconv -f latin1 -t utf-8 $< >$@
-
-vim-pl.UTF-8.1: vim-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
-
-evim-pl.UTF-8.1: evim-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
-
-vimdiff-pl.UTF-8.1: vimdiff-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
-
-vimtutor-pl.UTF-8.1: vimtutor-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
-
-xxd-pl.UTF-8.1: xxd-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
-
-vim-ru.UTF-8.1: vim-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
-
-evim-ru.UTF-8.1: evim-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
-
-vimdiff-ru.UTF-8.1: vimdiff-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
-
-vimtutor-ru.UTF-8.1: vimtutor-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
+	-rm -f doctags *.html tags.ref $(MANPAGES) $(HTMLS) errors.log
 
-xxd-ru.UTF-8.1: xxd-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index ec2086e3eb..5953648148 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6714,7 +6714,7 @@ gui_photon		Compiled with Photon GUI.
 gui_running		Vim is running in the GUI, or it will start soon.
 gui_win32		Compiled with MS Windows Win32 GUI.
 gui_win32s		idem, and Win32s system being used (Windows 3.1)
-hangul_input		Compiled with Hangul input support. |hangul|
+hangul_input		Compiled with Hangul input support.
 iconv			Can use iconv() for conversion.
 insert_expand		Compiled with support for CTRL-X expansion commands in
 			Insert mode.
diff --git a/runtime/doc/evim-fr.1 b/runtime/doc/evim-fr.1
deleted file mode 100644
index 898ed70c2a..0000000000
--- a/runtime/doc/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/evim-it.1 b/runtime/doc/evim-it.1
deleted file mode 100755
index 1e98a2d3f7..0000000000
--- a/runtime/doc/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/evim-pl.1 b/runtime/doc/evim-pl.1
deleted file mode 100644
index 490ee3a7ce..0000000000
--- a/runtime/doc/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/evim-ru.1 b/runtime/doc/evim-ru.1
deleted file mode 100644
index 6d6f5debf3..0000000000
--- a/runtime/doc/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/index.txt b/runtime/doc/index.txt
index cda17681fd..a9e884777e 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -34,7 +34,6 @@ tag		char		action in Insert mode	~
 |i_CTRL-@|	CTRL-@		insert previously inserted text and stop
 				insert
 |i_CTRL-A|	CTRL-A		insert previously inserted text
-		CTRL-B		not used |i_CTRL-B-gone|
 |i_CTRL-C|	CTRL-C		quit insert mode, without checking for
 				abbreviation, unless 'insertmode' set.
 |i_CTRL-D|	CTRL-D		delete one shiftwidth of indent in the current
diff --git a/runtime/doc/makehtml.awk b/runtime/doc/makehtml.awk
index 5e40069391..a1f77f5aba 100644
--- a/runtime/doc/makehtml.awk
+++ b/runtime/doc/makehtml.awk
@@ -6,6 +6,13 @@ BEGIN   {
 	sample="no";
 	while ( getline ti <"tags.ref" > 0 ) {
 		nf=split(ti,tag,"	");
+		# as help.txt renders into index.html and index.txt -> vimindex.html,
+		# this hack is needed to get the links right to those pages.
+		if ( tag[2] == "index.txt" ) {
+			tag[2] = "vimindex.txt"
+		} else if ( tag[2]  == "help.txt" ) {
+			tag[2] = "index.txt"
+		}
 		tagkey[tag[1]]="yes";tagref[tag[1]]=tag[2];
 	}
 	skip_word["and"]="yes";
diff --git a/runtime/doc/vim-de.UTF-8.1 b/runtime/doc/manpages/de/vim-de.1
index f79e622a74..f79e622a74 100644
--- a/runtime/doc/vim-de.UTF-8.1
+++ b/runtime/doc/manpages/de/vim-de.1
diff --git a/runtime/doc/evim.1 b/runtime/doc/manpages/evim.1
index bb859ceada..bb859ceada 100644
--- a/runtime/doc/evim.1
+++ b/runtime/doc/manpages/evim.1
diff --git a/runtime/doc/evim-fr.UTF-8.1 b/runtime/doc/manpages/fr/evim-fr.1
index 2b38e66cb5..2b38e66cb5 100644
--- a/runtime/doc/evim-fr.UTF-8.1
+++ b/runtime/doc/manpages/fr/evim-fr.1
diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/manpages/fr/vim-fr.1
index 67be106673..67be106673 100644
--- a/runtime/doc/vim-fr.UTF-8.1
+++ b/runtime/doc/manpages/fr/vim-fr.1
diff --git a/runtime/doc/vimdiff-fr.UTF-8.1 b/runtime/doc/manpages/fr/vimdiff-fr.1
index 3b44a3dd58..3b44a3dd58 100644
--- a/runtime/doc/vimdiff-fr.UTF-8.1
+++ b/runtime/doc/manpages/fr/vimdiff-fr.1
diff --git a/runtime/doc/vimtutor-fr.UTF-8.1 b/runtime/doc/manpages/fr/vimtutor-fr.1
index f47f840ec1..f47f840ec1 100644
--- a/runtime/doc/vimtutor-fr.UTF-8.1
+++ b/runtime/doc/manpages/fr/vimtutor-fr.1
diff --git a/runtime/doc/xxd-fr.UTF-8.1 b/runtime/doc/manpages/fr/xxd-fr.1
index 7956b3ba2a..7956b3ba2a 100644
--- a/runtime/doc/xxd-fr.UTF-8.1
+++ b/runtime/doc/manpages/fr/xxd-fr.1
diff --git a/runtime/doc/evim-it.UTF-8.1 b/runtime/doc/manpages/it/evim-it.1
index f96d0cb42c..f96d0cb42c 100644
--- a/runtime/doc/evim-it.UTF-8.1
+++ b/runtime/doc/manpages/it/evim-it.1
diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/manpages/it/vim-it.1
index 51e7e043da..51e7e043da 100644
--- a/runtime/doc/vim-it.UTF-8.1
+++ b/runtime/doc/manpages/it/vim-it.1
diff --git a/runtime/doc/vimdiff-it.UTF-8.1 b/runtime/doc/manpages/it/vimdiff-it.1
index 090892fa93..090892fa93 100644
--- a/runtime/doc/vimdiff-it.UTF-8.1
+++ b/runtime/doc/manpages/it/vimdiff-it.1
diff --git a/runtime/doc/vimtutor-it.UTF-8.1 b/runtime/doc/manpages/it/vimtutor-it.1
index a33dcb00b0..a33dcb00b0 100644
--- a/runtime/doc/vimtutor-it.UTF-8.1
+++ b/runtime/doc/manpages/it/vimtutor-it.1
diff --git a/runtime/doc/xxd-it.UTF-8.1 b/runtime/doc/manpages/it/xxd-it.1
index b6ccabd2e3..b6ccabd2e3 100644
--- a/runtime/doc/xxd-it.UTF-8.1
+++ b/runtime/doc/manpages/it/xxd-it.1
diff --git a/runtime/doc/evim-ja.UTF-8.1 b/runtime/doc/manpages/ja/evim-ja.1
index 1b7a657ebc..1b7a657ebc 100644
--- a/runtime/doc/evim-ja.UTF-8.1
+++ b/runtime/doc/manpages/ja/evim-ja.1
diff --git a/runtime/doc/vim-ja.UTF-8.1 b/runtime/doc/manpages/ja/vim-ja.1
index a4788b3c48..a4788b3c48 100644
--- a/runtime/doc/vim-ja.UTF-8.1
+++ b/runtime/doc/manpages/ja/vim-ja.1
diff --git a/runtime/doc/vimdiff-ja.UTF-8.1 b/runtime/doc/manpages/ja/vimdiff-ja.1
index 56fadfef6e..56fadfef6e 100644
--- a/runtime/doc/vimdiff-ja.UTF-8.1
+++ b/runtime/doc/manpages/ja/vimdiff-ja.1
diff --git a/runtime/doc/vimtutor-ja.UTF-8.1 b/runtime/doc/manpages/ja/vimtutor-ja.1
index 29b9b48f2c..29b9b48f2c 100644
--- a/runtime/doc/vimtutor-ja.UTF-8.1
+++ b/runtime/doc/manpages/ja/vimtutor-ja.1
diff --git a/runtime/doc/xxd-ja.UTF-8.1 b/runtime/doc/manpages/ja/xxd-ja.1
index 8a8d54b021..8a8d54b021 100644
--- a/runtime/doc/xxd-ja.UTF-8.1
+++ b/runtime/doc/manpages/ja/xxd-ja.1
diff --git a/runtime/doc/evim-pl.UTF-8.1 b/runtime/doc/manpages/pl/evim-pl.1
index 096a12add2..096a12add2 100644
--- a/runtime/doc/evim-pl.UTF-8.1
+++ b/runtime/doc/manpages/pl/evim-pl.1
diff --git a/runtime/doc/vim-pl.UTF-8.1 b/runtime/doc/manpages/pl/vim-pl.1
index f3551d2f63..f3551d2f63 100644
--- a/runtime/doc/vim-pl.UTF-8.1
+++ b/runtime/doc/manpages/pl/vim-pl.1
diff --git a/runtime/doc/vimdiff-pl.UTF-8.1 b/runtime/doc/manpages/pl/vimdiff-pl.1
index d66fdc9c03..d66fdc9c03 100644
--- a/runtime/doc/vimdiff-pl.UTF-8.1
+++ b/runtime/doc/manpages/pl/vimdiff-pl.1
diff --git a/runtime/doc/vimtutor-pl.UTF-8.1 b/runtime/doc/manpages/pl/vimtutor-pl.1
index 199fcd0e8f..199fcd0e8f 100644
--- a/runtime/doc/vimtutor-pl.UTF-8.1
+++ b/runtime/doc/manpages/pl/vimtutor-pl.1
diff --git a/runtime/doc/xxd-pl.UTF-8.1 b/runtime/doc/manpages/pl/xxd-pl.1
index e63ce64b74..e63ce64b74 100644
--- a/runtime/doc/xxd-pl.UTF-8.1
+++ b/runtime/doc/manpages/pl/xxd-pl.1
diff --git a/runtime/doc/evim-ru.UTF-8.1 b/runtime/doc/manpages/ru/evim-ru.1
index 581c364c22..581c364c22 100644
--- a/runtime/doc/evim-ru.UTF-8.1
+++ b/runtime/doc/manpages/ru/evim-ru.1
diff --git a/runtime/doc/vim-ru.UTF-8.1 b/runtime/doc/manpages/ru/vim-ru.1
index ef527213e3..ef527213e3 100644
--- a/runtime/doc/vim-ru.UTF-8.1
+++ b/runtime/doc/manpages/ru/vim-ru.1
diff --git a/runtime/doc/vimdiff-ru.UTF-8.1 b/runtime/doc/manpages/ru/vimdiff-ru.1
index 2f17e9c2e5..2f17e9c2e5 100644
--- a/runtime/doc/vimdiff-ru.UTF-8.1
+++ b/runtime/doc/manpages/ru/vimdiff-ru.1
diff --git a/runtime/doc/vimtutor-ru.UTF-8.1 b/runtime/doc/manpages/ru/vimtutor-ru.1
index 6b1ba90df0..6b1ba90df0 100644
--- a/runtime/doc/vimtutor-ru.UTF-8.1
+++ b/runtime/doc/manpages/ru/vimtutor-ru.1
diff --git a/runtime/doc/xxd-ru.UTF-8.1 b/runtime/doc/manpages/ru/xxd-ru.1
index 647845bab4..647845bab4 100644
--- a/runtime/doc/xxd-ru.UTF-8.1
+++ b/runtime/doc/manpages/ru/xxd-ru.1
diff --git a/runtime/doc/vim.1 b/runtime/doc/manpages/vim.1
index 820caa24f5..820caa24f5 100644
--- a/runtime/doc/vim.1
+++ b/runtime/doc/manpages/vim.1
diff --git a/runtime/doc/vimdiff.1 b/runtime/doc/manpages/vimdiff.1
index bed2b32889..bed2b32889 100644
--- a/runtime/doc/vimdiff.1
+++ b/runtime/doc/manpages/vimdiff.1
diff --git a/runtime/doc/vimtutor.1 b/runtime/doc/manpages/vimtutor.1
index 0aa7e8d8d9..0aa7e8d8d9 100644
--- a/runtime/doc/vimtutor.1
+++ b/runtime/doc/manpages/vimtutor.1
diff --git a/runtime/doc/xxd.1 b/runtime/doc/manpages/xxd.1
index e8f7358591..e8f7358591 100644
--- a/runtime/doc/xxd.1
+++ b/runtime/doc/manpages/xxd.1
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 84afe2f2b1..9365f39b2a 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -476,8 +476,6 @@ in memory, you can reduce that with these options:
   helps for a change that affects all lines.
 - 'undoreload' Set to zero to disable.
 
-Also see |msdos-limitations|.
-
 							*E339*  >
   Pattern too long
 
diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt
index 5e564d8416..5501b8009b 100644
--- a/runtime/doc/os_390.txt
+++ b/runtime/doc/os_390.txt
@@ -103,7 +103,6 @@ Disabled at compile time:
 
 Never tested:
     - Perl interface		(|perl|)
-    - Hangul input		(|hangul|)
     - Encryption support	(|encryption|)
     - Langmap			(|'langmap'|)
     - Python support		(|Python|)
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 2f1868e84e..a7050fa2e8 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -357,7 +357,7 @@ N  *+gettext*		message translations |multi-lang|
    *+GUI_GTK*		Unix only: GTK+ |GUI|
    *+GUI_Motif*		Unix only: Motif |GUI|
    *+GUI_Photon*	QNX only:  Photon |GUI|
-m  *+hangul_input*	Hangul input support |hangul|
+m  *+hangul_input*	Hangul input support hangul
    *+iconv*		Compiled with the |iconv()| function
    *+iconv/dyn*		Likewise |iconv-dynamic| |/dyn|
 N  *+insert_expand*	|insert_expand| Insert mode completion
diff --git a/runtime/doc/vim-de.1 b/runtime/doc/vim-de.1
deleted file mode 100644
index 0ba4938f7a..0000000000
--- a/runtime/doc/vim-de.1
+++ /dev/null
@@ -1,478 +0,0 @@
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.\" Translated by bw1 (2008) and Florian Rehnisch <fm-r@gmx.de> (2012)
-.\" Kudos to the folks on vim-dev and debian-l10n-german
-.TH VIM 1 "2006 Apr 11"  
-.SH BEZEICHNUNG
-vim \- Vi IMproved, ein Text\-Editor f�r Programmierer
-.SH �BERSICHT
-.br
-\fBvim\fP [Optionen] [Datei ...]
-.br
-\fBvim\fP [Optionen] \-
-.br
-\fBvim\fP [Optionen] \-t Tag
-.br
-\fBvim\fP [Optionen] \-q [Fehlerdatei]
-.PP
-.br
-\fBex\fP
-.br
-\fBview\fP
-.br
-\fBgvim\fP \fBgview\fP \fBevim\fP \fBeview\fP
-.br
-\fBrvim\fP \fBrview\fP \fBrgvim\fP \fBrgview\fP
-.SH BESCHREIBUNG
-\fBVim\fP ist ein Text\-Editor, der aufw�rtskompatibel zu Vi ist. Er kann
-verwendet werden, um alle Arten von Klartext zu bearbeiten. Er ist besonders
-n�tzlich, um Programme zu bearbeiten.
-.PP
-Vim hat einige Erweiterungen gegen�ber Vi, z.B.: R�ckg�ngigmachen in
-mehreren Schritten, mehrere Fenster und Puffer, Syntax\-Hervorhebung,
-Bearbeiten der Befehlszeile, Dateinamenerg�nzung, eingebaute Hilfe, visuelle
-Auswahl, usw. ... Siehe �:help vi_diff.txt� f�r eine �bersicht der
-Unterschiede zwischen \fBVim\fP und Vi.
-.PP
-Im laufenden \fBVim\fP kann mit dem Befehl �:help� viel Hilfe durch das
-eingebaute Hilfesystem erlangt werden. Siehe den Abschnitt EINGEBAUTE HILFE
-weiter unten.
-.PP
-Meistens wird \fBVim\fP zum Editieren einer einzigen Datei mit dem folgende
-Befehl gestartet:
-.PP
-  vim Datei
-.PP
-Allgemeiner betrachtet, wird \fBVim\fP folgenderma�en gestartet:
-.PP
-  vim [Optionen] [Dateiliste]
-.PP
-Bei einer fehlenden Dateiliste startet der Editor mit einem leeren
-Puffer. Andernfalls werden nach den folgenden vier M�glichkeiten eine oder
-mehrere Dateien bearbeitet:
-.TP  12
-Datei ...
-Eine Liste von Dateinamen. Die erste Datei wird in den Puffer geladen und
-zur aktuellen. Der Cursor wird auf der ersten Zeile des Puffers
-platziert. Zu den anderen Dateien kann mit dem Befehl �:next� gelangt
-werden. Falls einer der Dateinamen mit einem Bindestrich beginnt, stellen
-Sie der Dateiliste �\-\-� voran.
-.TP 
-\-
-Die zu bearbeitende Datei wird von der Standardeingabe gelesen. Befehle
-werden von der Standardfehlerausgabe gelesen, die ein Text\-Terminal sein
-sollte.
-.TP 
-\-t {Tag}
-Die zu editierende Datei und die anf�ngliche Cursor\-Position h�ngen von
-einem �Tag� ab, einer Art Sprungmarke. {Tag} wird in der Tag\-Datei
-nachgeschlagen, die zugeh�rige Datei wird zur aktuellen und der zugeh�rige
-Befehl wird ausgef�hrt. Dies wird meistens f�r Programme in der Sprache �C�
-benutzt, wobei {Tag} ein Funktionsname sein k�nnte. Die Wirkung dieses
-Befehls ist, dass die Datei, die die Funktion enth�lt, als aktuelle im
-Editor ge�ffnet und angezeigt wird und der Cursor auf dem Beginn der
-Funktion positioniert wird. Siehe �:help tag\-commands�.
-.TP 
-\-q [Fehlerdatei]
-Startet im QuickFix\-Modus. Die Datei [Fehlerdatei] wird gelesen und der
-erste Fehler wird angezeigt. Falls [Fehlerdatei] ausgelassen wird, wird der
-Dateiname aus der Option 'errorfile' verwendet (bei AmigaOS ist dies
-vorgabem��ig �AztecC.Err�, sowie "errors.err� bei anderen). Weitere Fehler
-k�nnen mit dem �:cn�\-Befehl angesprungen werden. Siehe ":help quickfix�.
-.PP
-\fBVim\fP reagiert unterschiedlich auf den Namen, der verwendet wird, um Vim zu
-starten (die ausf�hrbare Datei kann dieselbe sein).
-.TP  10
-vim
-der �normale� Weg, alles ist standardm��ig
-.TP 
-ex
-Startet im Ex\-Modus. Mit dem Befehl �:vi� gelangt man in den normalen
-Modus. Funktioniert auch mit dem Argument �\-e�.
-.TP 
-view
-Startet im Nur\-Lesen\-Modus. Die Datei wird vor dem �berschreiben
-gesch�tzt. Dasselbe wird mit dem Parameter �\-R� erreicht.
-.TP 
-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
-wird mit dem Parameter �\-Z� erreicht.
-.SH OPTIONEN
-Die Optionen k�nnen in beliebiger Reihenfolge vor oder nach den Dateinamen
-angegeben werden. Optionen ohne Parameter k�nnen hinter einem einzigen
-Bindestrich gruppiert werden.
-.TP  12
-+[Nummer]
-In der ersten Datei wird der Cursor auf die Zeile [Nummer] gesetzt. Falls
-[Nummer] nicht angegeben wird, wird der Cursor in die letzte Zeile der Datei
-gesetzt.
-.TP 
-+/{Suchmuster}
-In der ersten Datei wird der Cursor auf das erste Auftreten von {Suchmuster}
-gesetzt. Siehe �:help search\-pattern�.
-.TP 
-+{Befehl}
-.TP 
-\-c {Befehl}
-{Befehl} wird nach dem Lesen der ersten Datei ausgef�hrt. Als {Befehl} wird
-ein Ex\-Befehl erwartet. Sind in {Befehl} Leerzeichen vorhanden, muss alles
-in Anf�hrungszeichen gesetzt werden (h�ngt von der verwendeten Shell
-ab). Beispiel: vim "+set si" main.c
-.br
-Anmerkung: Sie k�nnen bis zu 10 �+�\- oder "\-c�\-Befehle verwenden.
-.TP 
-\-S {Datei}
-{Datei} wird nach dem Lesen der ersten Datei ausgef�hrt. Dies entspricht �\-c
-"source {Datei}"�. {Datei} darf nicht mit einem Bindestrich (\-)
-anfangen. Wenn kein Dateiname angegeben wird, wird �Session.vim� verwendet
-(Funktioniert nur, wenn �\-S� als letzter Parameter steht).
-.TP 
-\-\-cmd {Befehl}
-Wie �\-c�, aber dieser Befehl wird vor allen VimRC\-Dateien ausgef�hrt. Sie
-k�nnen unabh�ngig von den �\-c�\-Befehlen bis zu 10 dieser Befehle verwenden.
-.TP 
-\-A
-Falls \fBVim\fP mit Unterst�tzung f�r das Schreiben von rechts nach links und
-arabischer Tastaturbelegung compiliert wurde (ARABIC), startet dieser
-Parameter den Modus f�rs Arabische (:set arabic). Anderenfalls beendet sich
-\fBVim\fP mit einer Fehlermeldung.
-.TP 
-b
-Bin�rer Modus: Es werden einige Variablen gesetzt, sodass es m�glich ist,
-eine bin�re oder ausf�hrbare Datei zu bearbeiten.
-.TP 
-\-C
-Kompatibel: Setzt die Option 'compatible'. Das macht \fBVim\fP im Verhalten
-sehr �hnlich zu Vi, selbst wenn eine VimRC\-Datei existiert.
-.TP 
-\-d
-Startet im diff\-Modus. Es sollten zwei, drei oder vier Dateinamen als
-Parameter �bergeben werden. \fBVim\fP �ffnet sie alle und zeigt die
-Unterschiede an. Arbeitet wie vimdiff(1).
-.TP 
-\-d {Ger�t}
-�ffnet das {Ger�t}, um es als Terminal zu nutzen. Nur f�r AmigaOS. Beispiel:
-"\-d con:20/30/600/150".
-.TP 
-D
-Debug\-Modus: \fBVim\fP geht in den Debug\-Modus, wenn der erste Befehl in einem
-Skript ausgef�hrt wird.
-.TP 
-\-e
-Startet \fBVim\fP im Ex\-Modus, als w�rde als ausf�hrbare Datei �ex� aufgerufen.
-.TP 
-\-E
-Startet \fBVim\fP im erweiterten Ex\-Modus, als w�rde die ausf�hrbare Datei als
-�exim� aufgerufen.
-.TP 
-\-f
-Vordergrund: Bei der GUI\-Version erzeugt \fBVim\fP keinen neuen Prozess und
-l�st sich nicht von der Shell, in der er aufgerufen wurde. Bei AmigaOS wird
-kein neues Fenster ge�ffnet. Dieser Parameter wird benutzt, damit das
-aufrufende Programm auf das Beenden des Bearbeitungssitzung wartet (z.B.:
-mail). Bei AmigaOS funktionieren die Befehle �:sh� und ":!� nicht.
-.TP 
-\-\-nofork
-Vordergrund: Bei der GUI\-Version erzeugt \fBVim\fP keinen neuen Prozess und
-l�st sich nicht von der Shell, in der er aufgerufen wurde.
-.TP 
-\-F
-Wenn \fBVim\fP mit FKMAP\-Unterst�tzung f�r das Schreiben von rechts nach links
-und Farsi\-Tastatur\-Belegung kompiliert wurde, startet Vim im Farsi\-Modus,
-d.h. die Optionen 'fkmap' und 'rightleft' werden gesetzt. Andernfalls bricht
-\fBVim\fP mit einer Fehlermeldung ab.
-.TP 
-\-g
-Falls \fBVim\fP mit GUI\-Unterst�tzung kompiliert wurde, wird die GUI
-aktiviert. Falls keine GUI\-Unterst�tzung einkompiliert wurde, wird mit einer
-Fehlermeldung abgebrochen.
-.TP 
-\-h
-Gibt eine kleine Hilfe f�r die Befehlszeilenparameter aus. Danach beendet
-sich \fBVim.\fP
-.TP 
-\-H
-Hebr�isch\-Modus, falls \fBVim\fP mit RIGHTLEFT\-Unterst�tzung f�r das Schreiben
-von rechts nach links und hebr�ischer Tastaturbelegung kompiliert wurde,
-werden die Optionen 'hkmap' und 'rightleft' gesetzt. Andernfalls beendet
-sich \fBVim\fP mit einer Fehlermeldung.
-.TP 
-\-i {VimInfo}
-Wenn eine VimInfo\-Datei verwendet wird: Verwendet statt �~/.viminfo� die
-angegebene Datei. Es ist auch m�glich die Verwendung einer VimInfo\-Datei
-durch Angabe des Dateinamen �NONE� zu verhindern,
-.TP 
-\-L
-dasselbe wie �\-r�
-.TP 
-\-l
-Lisp\-Modus. Aktiviert die Optionen 'lisp' und 'showmatch'.
-.TP 
-\-m
-Deaktiviert das Ver�ndern von Dateien, indem die Option 'write' gel�scht
-wird. Der Puffer kann ver�ndert werden, nur das Schreiben einer Datei ist
-nicht m�glich.
-.TP 
-\-M
-Keine Ver�nderungen erlaubt: Die Optionen 'modifiable' und 'write' werden
-gel�scht, so dass �nderungen nicht erlaubt sind und Dateien nicht
-geschrieben werden k�nnen. Man beachte, dass diese Optionen ('modifiable',
-\&'write') dennnoch nachtr�glich zum Erlauben von �nderungen gesetzt werden
-k�nnen.
-.TP 
-\-N
-Nicht\-kompatibler Modus: L�scht die Option 'compatible'. Dies veranlasst
-\fBVim\fP, sich ein wenig besser, aber weniger Vi\-kompatibel zu verhalten,
-selbst wenn es keine VimRC\-Datei gibt.
-.TP 
-\-n
-Verwendet keine Auslagerungsdatei: Eine Wiederherstellung nach einem Absturz
-ist nicht m�glich. Auf einem langsamen Medium (Diskette) kann diese
-Einstellung n�tzlich sein. Kann auch mit �set uc=0� erreicht werden; kann
-mit �set uc=200� aufgehoben werden.
-.TP 
-\-nb
-\fBVim\fP fungiert als Server f�r NetBeans. Details siehe Dokumentation.
-.TP 
-\-o[N]
-�ffnet [N] Fenster �bereinander. Wenn keine Zahl angegeben wird, �ffne ein
-Fenster pro Datei.
-.TP 
-\-O[N]
-�ffnet [N] Fenster nebeneinander. Wenn keine Zahl angegeben wird, �ffne ein
-Fenster pro Datei.
-.TP 
-\-p[N]
-�ffnet [N] Reiterseiten. Wenn keine Zahl angegeben wird, �ffne eine
-Reiterseite pro Datei.
-.TP 
-\-R
-Nur\-Lesen\-Modus: Die Option 'readonly' wird gesetzt. Der Puffer kann noch
-bearbeitet werden, aber es wird verhindert, eine Datei aus Versehen zu
-�berschreiben. Wenn Sie wirklich eine Datei �berschreiben wollen, f�gen Sie
-dem Ex\-Befehl ein Ausrufezeichen hinzu (wie in �:w!�). Die Option "\-R�
-bedingt die Option �\-n� (siehe oben). Die Option 'readonly' kann durch ":set
-noro� gel�scht werden. Siehe �:help 'readonly'�.
-.TP 
-\-r
-Listet die Auslagerungsdateien und gibt Informationen zu ihrer
-Verwendbarkeit zur Wiederherstellung.
-.TP 
-\-r {Datei}
-Wiederherstellungsmodus: Die Auslagerungsdatei wird zur Wiederherstellung
-verwendet und hat denselben Dateinamen wie die Text\-Datei + �.swp�. Siehe
-":help recovery�.
-.TP 
-\-s
-Der stille Modus: Nur wenn die ausf�hrbare Datei als �ex� aufgerufen wird
-oder vor �\-s� die Option "\-e� gegeben wird.
-.TP 
-\-s {Eingabeskript}
-Die Datei {Eingabeskript} wird gelesen und ausgef�hrt, als w�rden Sie die
-Zeichen in ihr tippen. Dasselbe kann mit dem Befehl �:source!
-{Eingabeskript}� erreicht werden. Wird das Ende der Datei vor dem Beenden
-des Editors erreicht, werden weitere Zeichen von der Tastatur gelesen.
-.TP 
-\-T {Terminal}
-Setzt den Namen des benutzten Terminals. Nur erforderlich, wenn die
-Automatik nicht funktioniert. Sollte ein \fBVim\fP bekanntes Terminal sein:
-(builtin) oder in einer termcap\- oder terminfo\-Datei definiert.
-.TP 
-\-u {VimRC}
-Verwendet zur Initialisierung die Befehle in der Datei {VimRC}. Alle anderen
-Initialisierungen werden �bersprungen. Benutzen Sie dies, um eine besondere
-Art von Dateien zu bearbeiten. Dies kann auch benutzt werden, um alle
-Initialisierungen zu �berspringen, indem der Name �NONE� angegeben wird. F�r
-weitere Einzelheiten siehe �:help initialisation� innerhalb von Vim.
-.TP 
-\-U {GvimRC}
-Benutzt die Befehle in der Datei {GvimRC} f�r die Initialisierung der
-grafischen Oberfl�che. Alle anderen Initialisierungen werden
-�bersprungen. Dies kann ebenfalls benutzt werden, um alle
-GUI\-Initialisierungen zu �berspringen, indem der Name �NONE� angegeben
-wird. Siehe �:help gui\-init� innerhalb von Vim f�r weitere Einzelheiten.
-.TP 
-\-V[N]
-Ausf�hrlich (verbose): Gibt Meldungen dar�ber, welche Befehlsdateien
-eingelesen werden, und �ber das Lesen und Schreiben einer VimInfo\-Datei. Die
-optionale Zahl N ist der Wert f�r 'verbose'. Vorgabe ist 10.
-.TP 
-\-v
-Startet \fBVim\fP im Vi\-Modus, so als w�rde die ausf�hrbare Datei mit �vi�
-aufgerufen. Dies wirkt sich nur aus, wenn die ausf�hrbare Datei als �ex�
-aufgerufen wird.
-.TP 
-\-w {Ausgabeskript}
-Alle Zeichen, die eingetippt werden, werden in der Datei {Ausgabeskript}
-aufgezeichnet, solange bis Sie \fBVim\fP beenden. Dies ist n�tzlich, falls Sie
-eine Skript\-Datei zum Benutzen mit �vim \-s� oder ":source!� erzeugen
-wollen. Falls die Datei {Ausgabeskript} vorhanden ist, werden die Zeichen
-angeh�ngt.
-.TP 
-\-W {Ausgabeskript}
-Wie \-w, aber eine bereits vorhandene Datei wird �berschrieben.
-.TP 
-\-x
-Benutzt beim Schreiben von Dateien eine Verschl�sselung. Fragt nach dem
-Schl�ssel.
-.TP 
-\-X
-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.
-.TP 
-\-\-
-Markiert das Ende der Optionen. Argumente, die folgen, werden als Dateinamen
-behandelt. Dies kann benutzt werden, um einen Dateinamen mit �\-� am Anfang
-zu verwenden.
-.TP 
-\-\-echo\-wid
-Nur GTK\-GUI: Schreibe die Fenster\-ID auf die Standardausgabe.
-.TP 
-\-\-help
-Gibt eine Hilfe\-Nachricht aus und beendet, wie �\-h�.
-.TP 
-\-\-literal
-Nimmt die Dateinamen so wie sie sind und vervollst�ndigt sie nicht nach
-Metazeichen (*,?). Dies wirkt sich nicht unter Unix aus, wo die Shell die
-Metazeichen expandiert.
-.TP 
-\-\-noplugin
-Lade keine Plugins. Impliziert durch �\-u NONE�.
-.TP 
-\-\-remote
-Verbindet mit einem Vim\-Server und l�sst ihn die in den restlichen
-Argumenten angegeben Dateien editieren. Wenn kein Server gefunden wird,
-f�hrt dies zu einer Warnmeldung und die Dateien werden im gegenw�rtigen Vim
-zum Bearbeiten ge�ffnet.
-.TP 
-\-\-remote\-expr {Ausdruck}
-Verbindet mit einem Vim\-Server, f�hrt {Ausdruck} aus und zeigt das Ergebnis
-auf der Standardausgabe an.
-.TP 
-\-\-remote\-send {Zeichen}
-Verbindet mit einem Vim\-Server und sendet ihm {Zeichen}.
-.TP 
-\-\-remote\-silent
-Wie �\-\-remote�, aber ohne Warnung, wenn kein Server gefunden wird.
-.TP 
-\-\-remote\-wait
-Wie �\-\-remote�, aber Vim beendet sich nicht, bis die Dateien bearbeitet
-wurden.
-.TP 
-\-\-remote\-wait\-silent
-Wie �\-\-remote\-wait�, aber ohne Warnung, wenn kein Server gefunden wird.
-.TP 
-\-\-serverlist
-Listet die Namen aller gefundenen Vim\-Server auf.
-.TP 
-\-\-servername {Name}
-Benutzt {Name} als Server\-Namen. Wird f�r den gegenw�rtigen Vim benutzt,
-au�er es wird mit dem Argument �\-\-remote� benutzt, dann ist es der Name des
-zu kontaktierenden Servers.
-.TP 
-\-\-socketid {id}
-Nur GTK\-GUI: Benutzt den GtkPlug\-Mechanismus, um GVim in einem anderen
-Fenster laufen zu lassen.
-.TP 
-\-\-version
-Versionsinformation anzeigen und beenden
-.SH "EINGEBAUTE HILFE"
-Tippen Sie in \fBVim\fP �:help�, um zu beginnen. Geben Sie ":help begriff� ein,
-um Hilfe �ber ein bestimmtes Thema zu bekommen. Zum Beispiel �:help ZZ� f�r
-Hilfe �ber den Befehl �ZZ�. Benutzen Sie <Tab> und CTRL\-D, um
-Begriffe zu vervollst�ndigen (�:help cmdline\-completion�). Tags sind
-vorhanden, um von einem Ort zum anderen zu springen (eine Art
-Hypertext\-Verkn�pfungen, siehe �:help�). Auf diese Weise k�nnen alle
-Dokumentations\-Dateien aufgerufen werden, zum Beispiel �:help syntax.txt�.
-.SH DATEIEN
-.TP  15
-/usr/local/lib/vim/doc/*.txt
-Dokumentations\-Dateien f�r \fBVim\fP. Verwenden Sie �:help doc\-file\-list�, um
-die gesamte Liste zu bekommen.
-.TP 
-/usr/local/lib/vim/doc/tags
-Die �Tag�\-Datei, die verwendet wird, um Informationen in der Dokumentation
-zu finden.
-.TP 
-/usr/local/lib/vim/syntax/syntax.vim
-Die systemweite Einrichtung der Syntaxhervorhebung.
-.TP 
-/usr/local/lib/vim/syntax/*.vim
-Syntaxdateien f�r die verschiedenen Sprachen.
-.TP 
-/usr/local/lib/vim/vimrc
-Systemweite Einstellungsdatei f�r \fBVim\fP
-.TP 
-~/.vimrc
-Pers�nliche Einstellungsdatei f�r \fBVim\fP
-.TP 
-/usr/local/lib/vim/gvimrc
-Systemweite Einstellungsdatei f�r GVim
-.TP 
-~/.gvimrc
-Pers�nliche Einstellungsdatei f�r GVim
-.TP 
-/usr/local/lib/vim/optwin.vim
-Das Script, das von dem Befehl �:options� verwendet wird, eine sch�ne
-M�glichkeit, um Optionen zu betrachten und zu setzen.
-.TP 
-/usr/local/lib/vim/menu.vim
-Systemweite Einstellungsdatei f�r das Men� von GVim
-.TP 
-/usr/local/lib/vim/bugreport.vim
-Das Script zum Generieren eines Fehlerberichts. Siehe �:help bugs�.
-.TP 
-/usr/local/lib/vim/filetype.vim
-Mit diesem Script erkennt Vim den Typ einer Datei anhand ihres
-Dateinamens. Siehe �:help 'filetype'�.
-.TP 
-/usr/local/lib/vim/scripts.vim
-Mit diesem Script erkennt Vim den Typ einer Datei anhand ihres
-Inhaltes. Siehe �:help 'filetype'�.
-.TP 
-/usr/local/lib/vim/print/*.ps
-Diese Dateien werden zum Drucken von PostScript verwendet.
-.PP
-F�r die neuesten Informationen lesen Sie die Vim\-Homepage:
-.br
-<URL:http://www.vim.org/>
-.SH "SIEHE AUCH"
-vimtutor(1)
-.SH AUTOR
-\fBVim\fP wurde gr��tenteils von Bram Moolenaar erstellt, mit viel Hilfe von
-anderen Leuten. Siehe �:help credits� in \fBVim.\fP
-.br
-\fBVim\fP basiert auf Stevie, der von Tim Thompson, Tony Andrews und
-G.R. (Fred) Walter geschrieben wurde. Es ist jedoch kaum etwas vom
-urspr�nglichen Code �brig geblieben.
-.SH FEHLER
-Die sind m�glich. Siehe �:help todo� f�r eine Liste bekannter Probleme.
-.PP
-Beachten Sie, dass gewisse Dinge, die manche Leute als Fehler betrachten
-m�gen, in Wirklichkeit durch zu getreue Nachbildung des Vi\-Verhaltens
-verursacht werden. Und falls Sie denken, dass andere Dinge Fehler sind,
-�weil Vi es anders tut�, sollten Sie einen genaueren Blick auf die Datei
-vi_diff.txt werfen (oder in Vim �:help vi_diff.txt� tippen). Sehen Sie sich
-auch die Optionen 'compatible' und 'cpoptions' an.
diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1
deleted file mode 100644
index 209ab915c9..0000000000
--- a/runtime/doc/vim-fr.1
+++ /dev/null
@@ -1,589 +0,0 @@
-.\" Traduction lundi 7 ao�t 2000 par Richard Hitier
-.\" (richard.hitier@dial.oleane.com)
-.\" Mise � jour de la traduction par David Blanchet
-.\" (david.blanchet@free.fr) 2006-06-10
-.\" Mise � jour de la traduction par Dominique Pell�
-.\" (dominique.pelle@gmail.com) 2013-05-10
-.\"
-.TH VIM 1 "22 f�vrier 2002"
-.SH NOM
-vim \- Vi IMproved, �diteur de texte pour programmeurs
-.SH SYNOPSIS
-.br
-.B vim
-[options] [fichier ...]
-.br
-.B vim
-[options] \-
-.br
-.B vim
-[options] \-t marqueur
-.br
-.B vim
-[options] \-q [fichiererreurs]
-.PP
-.br
-.B ex
-.br
-.B view
-.br
-.B gvim
-.B gview
-.B evim
-.B eview
-.br
-.B rvim
-.B rview
-.B rgvim
-.B rgview
-.SH DESCRIPTION
-.B Vim
-est un �diteur de texte proposant une compatibilit� ascendante
-avec Vi. Il permet d'�diter n'importe quel type de texte brut.
-Il est particuli�rement adapt� pour l'�dition des programmes.
-.PP
-Il comporte de nombreuses am�liorations par rapport � Vi : annulation sur
-plusieurs niveaux, fen�tres et tampons multiples, coloration syntaxique,
-�dition en ligne de commande, compl�tement des noms de fichiers, aide en
-ligne, s�lection visuelle, etc.
-Voir ":help vi_diff.txt" pour un r�sum� des diff�rences entre
-.B Vim
-et Vi.
-.PP
-Pendant l'ex�cution de
-.B Vim
-\, une aide abondante est accessible au travers du syst�me d'aide
-en ligne, gr�ce � la commande ":help".
-Voir la section AIDE EN LIGNE plus bas.
-.PP
-Le plus souvent
-.B Vim
-est d�marr� pour �diter un unique fichier avec la commande
-.PP
-	vim fichier
-.PP
-Plus g�n�ralement,
-.B Vim
-est lanc� avec :
-.PP
-	vim [options] [listefichiers]
-.PP
-Si la listefichiers est omise, l'�diteur d�marre avec un tampon vide.
-Autrement, l'une des quatre m�thodes suivantes vous permettra de choisir
-un ou plusieurs fichiers � �diter.
-.TP 12
-fichier ...
-Une liste de noms de fichiers.
-Le premier sera le fichier courant et sera lu dans le tampon.
-Le curseur sera plac� sur la premi�re ligne du tampon.
-Vous pouvez passer aux autres fichiers avec la commande ":next".
-Pour �diter un fichier d�butant par un tiret, faites pr�c�der la
-liste de fichiers par "\-\-".
-.TP
-\-
-Le fichier � �diter est lu sur l'entr�e standard (stdin). Les commandes sont
-lues depuis stderr, qui devrait �tre un terminal.
-.TP
-\-t {marqueur}
-Le fichier � �diter et la position initiale du curseur d�pendent
-d'un "marqueur", qui est une sorte d'�tiquette.
-{marqueur} est recherch� dans le fichier des marqueurs, le fichier correspondant
-devient le fichier courant et la commande associ�e est ex�cut�e.
-Principalement utile pour les programmes en C ; dans ce cas, {marqueur}
-peut �tre le nom d'une fonction.
-Au final, le fichier contenant cette fonction devient le fichier
-courant et le curseur est plac� au d�but de la fonction.
-Voir ":help tag\-commands".
-.TP
-\-q [fichiererreurs]
-D�marre en mode Mise-au-point (QuickFix).
-Le fichier [fichiererreurs] est lu et la premi�re erreur est affich�e.
-Si [fichiererreurs] est omis, le nom du fichier est lu dans
-l'option 'errorfile' ("AztecC.Err" par d�faut sur Amiga, "errors.err" sur les
-autres syst�mes).
-La commande ":cn" permet de sauter aux erreurs suivantes.
-Voir ":help quickfix".
-.PP
-.B Vim
-se comporte diff�remment selon le nom de la commande (l'ex�cutable peut
-cependant �tre le m�me fichier).
-.TP 10
-vim
-La fa�on "normale", le comportement par d�faut.
-.TP
-ex
-D�marre en mode Ex.
-La commande ":vi" permet de passer en mode Normal.
-Ce mode est �galement accessible avec l'argument "\-e".
-.TP
-view
-D�marre en mode Lecture-Seule. Vous �tes prot�g� de l'�criture accidentelle
-des fichiers. Ce mode est �galement accessible avec l'argument "\-R".
-.TP
-gvim gview
-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
-.B Vim.
-�galement accessible avec l'argument "\-Z".
-.SH OPTIONS
-Les options peuvent �tre sp�cifi�es dans n'importe quel ordre,
-avant ou apr�s les noms de fichiers. Les options sans arguments
-peuvent �tre combin�es apr�s un unique tiret.
-.TP 12
-+[num]
-Place le curseur sur la ligne "num" dans le premier fichier.
-Si "num" est omis, le curseur sera plac� sur la derni�re ligne.
-.TP
-+/{motif}
-Place le curseur sur la premi�re occurrence de {motif} dans le premier fichier.
-Voir ":help search\-pattern" pour conna�tre les motifs de recherches
-disponibles.
-.TP
-+{commande}
-.TP
-\-c {commande}
-Ex�cute {commande} apr�s la lecture du premier fichier.
-{commande} est interpr�t�e comme une commande Ex.
-Si la {commande} contient des espaces, elle doit �tre entour�e
-de doubles-apostrophes (cela d�pend du shell utilis�).
-Exemple : Vim "+set si" main.c
-.br
-Note : vous pouvez utiliser jusqu'� 10 commandes "+" ou "\-c".
-.TP
-\-S {fichier}
-Source {fichier} apr�s la lecture du premier fichier.
-C'est �quivalent � \-c "source {fichier}".
-{fichier} ne peut pas d�buter par un '\-'.
-Si {fichier} est omis, "Session.vim" est utilis� (cela ne fonctionne que si
-\-S est le dernier argument).
-.TP
-\-\-cmd {commande}
-Comme "\-c", mais la commande est ex�cut�e juste avant de traiter les fichiers
-vimrc.
-Vous pouvez utiliser jusqu'� 10 de ces commandes, ind�pendamment des
-commandes "\-c".
-.TP
-\-A
-Si
-.B Vim
-a �t� compil� avec le support de la fonctionnalit� ARABIC pour l'�dition de
-fichiers de droite � gauche et les claviers arabes, cette option lance
-.B Vim
-en mode Arabe, c.-�-d. que l'option 'arabic' est activ�e.
-Sinon, un message d'erreur est �mis et
-.B Vim
-quitte.
-.TP
-\-b
-Mode Binaire.
-Active plusieurs options pour permettre l'�dition
-d'un fichier binaire ou ex�cutable.
-.TP
-\-C
-Compatible. Active l'option 'compatible'.
-.B Vim
-se comportera alors quasiment comme Vi, m�me s'il existe un fichier .vimrc.
-.TP
-\-d
-D�marre en mode Diff.
-Deux, trois ou quatre noms de fichiers doivent �tre sp�cifi�s.
-.B Vim
-ouvrira alors tous les fichiers et affichera leurs diff�rences.
-Fonctionne comme vimdiff(1).
-.TP
-\-d {p�riph}
-Ouvre {p�riph} pour l'utiliser comme terminal.
-Uniquement sur Amiga.
-Exemple :
-"\-d con:20/30/600/150".
-.TP
-\-D
-Debogage. Passe en mode D�bogage lors de l'ex�cution de la premi�re commande
-d'un script.
-.TP
-\-e
-D�marre
-.B Vim
-en mode Ex, comme si l'ex�cutable s'appelait "ex".
-.TP
-\-E
-D�marre
-.B Vim
-en mode Ex am�lior�, comme si l'ex�cutable "exim" avait �t� invoqu�.
-.TP
-\-f
-Premier-plan (Foreground). Pour la version graphique,
-.B Vim
-ne forke pas et ne se d�tache pas du shell dans lequel il a �t� invoqu�.
-Sur Amiga,
-.B Vim
-n'est pas relanc� pour ouvrir une nouvelle fen�tre.
-Cette option est utile quand
-.B Vim
-est ex�cut� par un programme qui attend la fin de la session d'�dition
-(par exemple mail).
-Sur Amiga, les commandes ":sh" et ":!" ne fonctionneront pas.
-.TP
-\-\-nofork
-Premier-plan (Foreground). Pour la version graphique,
-.B Vim
-ne forkera pas et ne se d�tachera pas du shell dans lequel il a �t� lanc�.
-.TP
-\-F
-Si
-.B Vim
-a �t� compil� avec le support de la fonctionnalit� FKMAP pour l'�dition de
-fichiers de droite � gauche et les claviers farsi, cette option lance
-.B Vim
-en mode Farsi, c.-�-d. avec les options 'fkmap' et 'rightleft' activ�es.
-Sinon, un message d'erreur est �mis et
-.B Vim
-quitte.
-.TP
-\-g
-Si
-.B Vim
-a �t� compil� avec le support de l'IHM graphique, cette option active
-l'IHM graphique. Si le support n'a pas �t� compil�, un message d'erreur
-est �mis et
-.B Vim
-quitte.
-.TP
-\-h
-Donne une aide succincte sur les arguments et les options de la ligne de
-commande. Apr�s cela,
-.B Vim
-quitte.
-.TP
-\-H
-Si
-.B Vim
-a �t� compil� avec le support de la fonctionnalit� RIGHTLEFT pour l'�dition de
-fichiers de droite � gauche et les claviers h�breux, cette option lance
-.B Vim
-en mode H�breu, c.-�-d. avec les options 'hkmap' et 'rightleft' activ�es.
-Sinon, un message d'erreur est �mis et
-.B Vim
-quitte.
-.TP
-\-i {viminfo}
-Lorsque l'utilisation d'un fichier viminfo est activ�e, cette option indique
-le nom de fichier � utiliser � la place de "~/.viminfo" par d�faut.
-Il est possible d'emp�cher l'utilisation d'un fichier ".viminfo", en
-sp�cifiant le nom de fichier "NONE".
-.TP
-\-L
-Comme \-r.
-.TP
-\-l
-Mode Lisp.
-Active les options 'lisp' et 'showmatch'.
-.TP
-\-m
-Emp�che la modification des fichiers.
-D�sactive l'option 'write'.
-Vous pouvez toujours modifier le tampon, mais il vous sera impossible
-d'�crire le fichier.
-.TP
-\-M
-N'autorise aucune modification. les options 'modifiable' et 'write' sont
-d�sactiv�es, de sorte que les changements ne sont pas autoris�s et que les
-fichiers ne peuvent pas �tre �crits. Note : ces options peuvent �tre activ�es
-pour autoriser les modifications.
-.TP
-\-N
-Mode Non-compatible. D�sactive l'option 'compatible'.
-Cela am�liorera le comportement de
-.B Vim
-\, mais il sera moins conforme � celui de Vi, m�me s'il n'existe aucun
-fichier ".vimrc".
-.TP
-\-n
-N'utilise pas de fichier d'�change (swapfile).
-Le recouvrement apr�s un plantage sera impossible.
-Utile pour �diter un fichier sur un support tr�s lent (disquette par ex.).
-�galement activable avec ":set uc=0".
-Il est possible de l'annuler avec ":set uc=200".
-.TP
-\-nb
-Devient un serveur d'�dition pour NetBeans. Consulter la documentation � ce
-sujet pour davantage de d�tails.
-.TP
-\-o[N]
-Ouvre N fen�tres les unes au-dessus des autres.
-Quand N est omis, ouvre une fen�tre pour chaque fichier.
-.TP
-\-O[N]
-Ouvre N fen�tres c�te � c�te.
-Quand N est omis, ouvre une fen�tre pour chaque fichier fichier.
-.TP
-\-p[N]
-Ouvre N onglets.
-Quand N est omis, ouvre un onglet pour chaque fichier fichier.
-.TP
-\-R
-Mode Lecture-Seule.
-Active l'option 'readonly'.
-Vous pouvez toujours �diter le tampon, mais il vous sera impossible de
-d'�craser accidentellement un fichier.
-Si vous voulez �craser un fichier, ajoutez un point d'exclamation � la commande
-Ex, comme dans ":w!".
-L'option \-R impose l'option \-n (voir ci-dessus).
-L'option 'readonly' peut �tre d�sactiv�e avec ":set noro".
-Voir ":help 'readonly'".
-.TP
-\-r
-Donne la liste des fichiers d'�change, avec des informations pour les utiliser
-� des fins de recouvrement.
-.TP
-\-r {file}
-Mode Recouvrement.
-Utilise le fichier d'�change pour r�couvrer d'une session d'�dition plant�e.
-Le fichier d'�change est un fichier avec le m�me nom que le fichier texte,
-suivi du suffixe ".swp".
-Voir ":help recovery".
-.TP
-\-s
-Mode Silencieux. Disponible uniquement quand
-.B Vim
-est lanc� en tant que "ex" ou quand l'option "\-e" a �t� sp�cifi�e avant
-l'option "\-s".
-.TP
-\-s {scriptEntr�e}
-Lit le fichier de script {scriptEntr�e}.
-Les caract�res du fichier sont interpr�t�s comme si vous les tapiez.
-La commande ":source! {scriptEntr�e}" donne le m�me r�sultat.
-Si la fin du fichier est atteinte avant que l'�diteur quitte, les caract�res
-suivants sont lus depuis le clavier.
-.TP
-\-T {terminal}
-Indique �
-.B Vim
-le nom du terminal utilis�.
-Cela n'est requis que lorsque la d�tection automatique �choue.
-Le {terminal} devrait �tre connu de
-.B Vim
-(int�gr�) ou d�fini dans le fichier termcap ou terminfo.
-.TP
-\-u {vimrc}
-Utilise les commandes du fichier {vimrc} pour les initialisations.
-Toutes les autres initialisations sont omises.
-� utiliser pour �diter un type de fichiers particulier.
-Cela permet aussi d'omettre toute initialisation en sp�cifiant le nom de
-fichier "NONE".
-Voir ":help initialization" dans Vim pour davantage de d�tails.
-.TP
-\-U {gvimrc}
-Utilise les commandes du fichier {gvimrc} pour l'initialisation de l'IHM
-graphique.
-Toutes les autres initialisations graphiques sont omises.
-Cela permet aussi d'omettre toute initialisation graphique en sp�cifiant le nom
-de fichier "NONE".
-Voir ":help gui\-init" dans Vim pour davantage de d�tails.
-.TP
-\-V[N]
-Mode Verbeux.
-Donne des messages � propos des fichiers sourc�s, ainsi que sur la lecture
-et les �critures dans le fichier viminfo. le nombre optionnel N pr�cise la
-valeur de l'option 'verbose' (10 par d�faut).
-.TP
-\-v
-D�marre
-.B Vim
-en mode Vi, comme si l'ex�cutable s'appelait "vi". Cela n'a d'effet que si
-l'ex�cutable invoqu� est "ex".
-.TP
-\-w {scriptSortie}
-Tous les caract�res que vous tapez sont enregistr�s dans le fichier
-{scriptSortie}, jusqu'� ce que vous quittiez
-.B Vim.
-C'est utile quand vous voulez cr�er un fichier de script � utiliser avec
-"vim \-s" ou ":source!".
-Si le fichier {scriptSortie} existe, les caract�res sont ajout�s � la fin.
-.TP
-\-W {scriptSortie}
-Comme \-w, mais un fichier existant sera �cras�.
-.TP
-\-x
-Chiffre les fichiers lors de l'�criture. Une cl� de chiffrement sera demand�e.
-.TP
-\-X
-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
-\-\-
-D�limite la fin des options.
-Les arguments qui suivent seront consid�r�s comme des noms de fichiers.
-Cela permet d'�diter des fichiers d�butant par un '\-'.
-.TP
-\-\-echo\-wid
-IHM graphique GTK uniquement : retourne la Window ID sur stdout.
-.TP
-\-\-help
-Donne un message d'aide et quitte, comme "\-h".
-.TP
-\-\-literal
-Prend les arguments de noms de fichiers litt�ralement, sans �tendre les
-jokers. N'a aucun effet sur Unix, o� le shell �tend les jokers.
-.TP
-\-\-noplugin
-Ne charge pas les greffons. Implicite avec \-u NONE.
-.TP
-\-\-remote
-Se connecte � un serveur Vim et lui fait �diter les fichiers sp�cifi�s dans
-le reste des arguments. Si aucun serveur n'est trouv�, un avertissement est
-�mis et les fichiers sont �dit�s dans le Vim courant.
-.TP
-\-\-remote\-expr {expr}
-Se connecte � un serveur Vim, y �value {expr} et affiche le r�sultat sur la
-sortie standard (stdout).
-.TP
-\-\-remote\-send {touches}
-Se connecte � un serveur Vim et y envoie {touches}.
-.TP
-\-\-remote\-silent
-Comme \-\-remote, mais sans �mettre d'avertissement si aucun serveur n'est
-trouv�.
-.TP
-\-\-remote\-wait
-Comme \-\-remote, mais Vim ne quitte pas tant que le fichier est en cours
-d'�dition.
-.TP
-\-\-remote\-wait\-silent
-Comme \-\-remote\-wait, mais sans �mettre d'avertissement si aucun serveur n'est
-trouv�.
-.TP
-\-\-serverlist
-Donne la liste des noms de tous les serveurs Vim disponibles.
-.TP
-\-\-servername {nom}
-Utilise {nom} pour le nom de serveur. Ce nom est donn� au Vim courant, � moins
-qu'il ne soit utilis� avec un argument \-\-remote. Dans ce cas, il s'agit du nom
-du serveur auquel se connecter.
-.TP
-\-\-socketid {id}
-IHM graphique GTK+ uniquement : utilise le m�canisme GtkPlug pour faire
-fonctionner gvim dans une autre fen�tre.
-.TP
-\-\-version
-Affiche les informations sur la version puis quitte.
-.SH AIDE EN LIGNE
-Taper ":help" dans
-.B Vim
-pour commencer.
-Taper ":help sujet" pour obtenir de l'aide sur un sujet pr�cis.
-Par exemple : ":help ZZ" pour consulter l'aide sur la commande "ZZ".
-Utiliser <Tab> et CTRL\-D pour compl�ter les sujets (":help
-cmdline\-completion").
-Des marqueurs sont inclus dans l'aide et vous permettent de sauter d'un endroit
-� un autre (comme des liens hypertextes, voir ":help").
-L'ensemble des fichiers de la documentation peut �tre consult� de cette
-fa�on, par exemple ":help syntax.txt".
-.SH FICHIERS
-.TP 15
-/usr/local/lib/vim/doc/*.txt
-Les fichiers de la documentation de
-.B Vim.
-Utiliser ":help doc\-file\-list" pour obtenir la liste compl�te.
-.TP
-/usr/local/lib/vim/doc/tags
-Le fichier des marqueurs utilis� pour trouver les informations dans les
-fichiers de la documentation.
-.TP
-/usr/local/lib/vim/syntax/syntax.vim
-Initialisation de la syntaxe pour l'ensemble du syst�me.
-.TP
-/usr/local/lib/vim/syntax/*.vim
-Fichiers de syntaxe pour diff�rents langages.
-.TP
-/usr/local/lib/vim/vimrc
-Initialisation de
-.B Vim
-pour l'ensemble du syst�me.
-.TP
-~/.vimrc
-Initialisation de
-.B Vim
-de votre compte utilisateur.
-.TP
-/usr/local/lib/vim/gvimrc
-Initialisation de gvim pour l'ensemble du syst�me.
-.TP
-~/.gvimrc
-Initialisation de gvim pour votre compte utilisateur.
-.TP
-/usr/local/lib/vim/optwin.vim
-Script utilis� pour la commande ":options", une mani�re pratique de consulter
-et de modifier les options.
-.TP
-/usr/local/lib/vim/menu.vim
-Initialisation des menus de gvim pour l'ensemble du syst�me.
-.TP
-/usr/local/lib/vim/bugreport.vim
-Script pour g�n�rer un rapport de bogue. Voir ":help bugs".
-.TP
-/usr/local/lib/vim/filetype.vim
-Script pour d�tecter le type d'un fichier d'apr�s son nom.
-Voir ":help 'filetype'".
-.TP
-/usr/local/lib/vim/scripts.vim
-Script pour d�tecter le type d'un fichier d'apr�s son contenu.
-Voir ":help 'filetype'".
-.TP
-/usr/local/lib/vim/print/*.ps
-Fichiers utilis�s pour l'impression PostScript.
-.PP
-Pour disposer d'informations r�centes, consulter le site Internet de VIM :
-.br
-<URL:http://www.vim.org/>
-.SH VOIR AUSSI
-vimtutor(1)
-.SH AUTEUR
-La majeure partie de
-.B Vim
-a �t� �crite par Bram Moolenaar, avec l'aide de nombreux autres contributeurs.
-Voir ":help credits" dans
-.B Vim.
-.br
-.B Vim
-est bas� sur Stevie, r�alis� par Tim Thompson,
-Tony Andrews et G.R. (Fred) Walter.
-Toutefois, pratiquement rien du code original ne subsiste.
-.SH BOGUES
-Probablement.
-Voir ":help todo" pour consulter la liste des probl�mes connus.
-.PP
-NOTE : Remarquez que bon nombre de points, qui pourraient �tre consid�r�s comme
-des bugs par certains, sont en fait dus � une reproduction trop fid�le
-du comportement de Vi. Et si vous pensez que d'autres points sont des
-bugs "parce que Vi le fait diff�remment", vous devriez jeter un oeil
-attentif au fichier vi_diff.txt (ou taper ":help vi_diff.txt" dans Vim).
-Regardez aussi les options 'compatible' et 'coptions'.
-.SH TRADUCTION
-Cette page de manuel a �t� traduite par Richard Hitier.
-<richard.hitier@dial.oleane.com> 2000-08-07.
-.br
-Cette page de manuel a �t� mise � jour par David Blanchet.
-<david.blanchet@free.fr> 2006-04-10.
-Mise � jour 2013-05-10, Dominique Pell� <dominique.pelle@gmail.com>
diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1
deleted file mode 100755
index 0ab3eff0d2..0000000000
--- a/runtime/doc/vim-it.1
+++ /dev/null
@@ -1,566 +0,0 @@
-.TH VIM 1 "22 febbraio 2002"
-.SH NOME
-vim \- VI Migliorato, un editor di testi per programmatori
-.SH SINTASSI
-.br
-.B vim
-[opzioni] [file ..]
-.br
-.B vim
-[opzioni] \-
-.br
-.B vim
-[opzioni] \-t tag
-.br
-.B vim
-[opzioni] \-q [file_errori]
-.PP
-.br
-.B ex
-.br
-.B view
-.br
-.B gvim
-.B gview
-.B evim
-.B eview
-.br
-.B rvim
-.B rview
-.B rgvim
-.B rgview
-.SH DESCRIZIONE
-.B Vim
-Un editore di testi, compatibile con, e migliore di, Vi.
-Pu� essere usato per editare qualsiasi file di testo.
-Particolarmente utile per editare programmi.
-.PP
-Ci sono parecchi miglioramenti rispetto a Vi: undo multipli,
-finestre e buffer multipli, evidenziazione sintattica, possibilit�
-di modificare la linea di comando, completamento nomi file, help
-in linea, selezione testi in Modo Visual, etc..
-Vedere ":help vi_diff.txt" per un sommario delle differenze fra
-.B Vim
-e Vi.
-.PP
-Mentre usate
-.B Vim
-potete ricevere molto aiuto dal sistema di help online, col comando ":help".
-Vedere qui sotto la sezione AIUTO ONLINE.
-.PP
-Quasi sempre
-.B Vim
-viene invocato, per modificare un file, col comando
-.PP
-	vim nome_file
-.PP
-Pi� in generale
-.B Vim
-viene invocato con:
-.PP
-	vim [opzioni] [lista_file]
-.PP
-Se lista_file non � presente, l'editor inizia aprendo un buffer vuoto.
-Altrimenti, una e una sola delle quattro maniere indicate qui sotto pu�
-essere usata per scegliere uno o pi� file da modificare.
-.TP 12
-nome_file ..
-Una lista di nomi di file.
-Il primo di questi sar� il file corrente, e verr� letto nel buffer.
-Il cursore sar� posizionato sulla prima linea del buffer.
-Potete arrivare agli altri file col comando ":next".
-Per editare un file il cui nome inizia per "\-" premettete "\-\-" alla
-lista_file.
-.TP
-\-
-Il file da editare � letto dallo "stdin" [di solito, ma non
-necessariamente, il terminale \- NdT].  I comandi sono letti da "stderr",
-che dovrebbe essere un terminale [tty].
-.TP
-\-t {tag}
-Il file da editare e la posizione iniziale del cursore dipendono da "tag",
-una specie di "etichetta" a cui saltare.
-{tag} viene cercata nel file "tags", ed il file ad essa associato diventa
-quello corrente, ed il comando ad essa associato viene eseguito.
-Di solito si usa per programmi C, nel qual caso {tag} potrebbe essere un
-nome di funzione.
-L'effetto � che il file contenente quella funzione diventa il file corrente
-e il cursore � posizionato all'inizio della funzione.
-Vedere ":help tag\-commands".
-.TP
-\-q [file_errori]
-Inizia in Modo QuickFix [correzione veloce].
-Il file [file_errori] � letto e il primo errore � visualizzato.
-Se [file_errori] non � indicato, il suo nome � ottenuto dal valore
-dell'opzione 'errorfile' (che, se non specificata, vale "AztecC.Err"
-per l'Amiga, "errors.err" su altri sistemi).
-Si pu� saltare all'errore successivo col comando ":cn".
-Vedere ":help quickfix".
-.PP
-.B Vim
-si comporta in modo diverso se invocato con nomi differenti (il programma
-eseguibile "sottostante" pu� essere sempre lo stesso).
-.TP 10
-vim
-Modo Normal, comportamento normale.
-.TP
-ex
-Inizia in Modo "Ex".
-Si pu� passare in Modo Normal col comando ":vi".
-Si pu� invocare il Modo "Ex" anche con l'argomento "\-e".
-.TP
-view
-Inizia in Modo Read-only (Sola Lettura).  Non potete modificare i file.
-Si pu� invocare il Modo Read-only anche con l'argomento "\-R".
-.TP
-gvim gview
-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
-.B Vim.
-Si pu� chiedere la stessa cosa anche con l'argomento "\-Z".
-.SH OPZIONI
-Le opzioni possono essere in un ordine qualsiasi, prima o dopo i nomi di
-file.  Opzioni che non necessitano un argomento possono essere specificate
-dietro a un solo "\-".
-.TP 12
-+[numero]
-Per il primo file il cursore sar� posizionato sulla linea "numero".
-Se "numero" manca, il cursore sar� posizionato sull'ultima linea del file.
-.TP
-+/{espressione}
-Per il primo file il cursore sar� posizionato alla
-prima occorrenza di {espressione}.
-Vedere ":help search\-pattern" per come specificare l'espressione.
-.TP
-+{comando}
-.TP
-\-c {comando}
-{comando} sar� eseguito dopo che il
-primo file � stato letto.
-{comando} � interpretato come un comando Ex.
-Se il {comando} contiene spazi deve essere incluso fra doppi apici
-(o altro delimitatore, a seconda della shell che si sta usando).
-Esempio: Vim "+set si" main.c
-.br
-Note: Si possono avere fino a 10 comandi "+" o "\-c".
-.TP
-\-S {file}
-I comandi contenuti in {file} sono eseguiti dopo la lettura del primo file.
-Equivalente a \-c "source {file}".
-{file} non pu� avere un nome che inizia per '\-'.
-Se {file} � omesso si usa "Session.vim" (funziona solo se \-S � l'ultimo
-argomento specificato).
-.TP
-\-\-cmd {comando}
-Come "\-c", ma il comando � eseguito PRIMA
-di eseguire qualsiasi file vimrc.
-Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi
-"\-c".
-.TP
-\-A
-Se
-.B Vim
-� stato compilato con supporto Arabic per editare file con orientamento
-destra-sinistra e tastiera con mappatura Araba, questa opzione inizia
-.B Vim
-in Modo Arabic, cio� impostando 'arabic'.
-Altrimenti viene dato un messaggio di errore e
-.B Vim
-termina in modo anormale.
-.TP
-\-b
-Modo Binary (binario).
-Vengono impostate alcune opzioni che permettono di modificare un file
-binario o un programma eseguibile.
-.TP
-\-C
-Compatibile.  Imposta l'opzione 'compatible'.
-In questo modo
-.B Vim
-ha quasi lo stesso comportamento di Vi, anche in presenza di un file
-di configurazione .vimrc [proprio di Vim, vi usa .exrc \- Ndt].
-.TP
-\-d
-Inizia in Modo Diff [differenze].
-Dovrebbero esserci come argomenti due o tre o quattro nomi di file.
-.B Vim
-aprir� tutti i file evidenziando le differenze fra gli stessi.
-Funziona come vimdiff(1).
-.TP
-\-d {dispositivo}
-Apre {dispositivo} per usarlo come terminale.
-Solo per l'Amiga.
-Esempio:
-"\-d con:20/30/600/150".
-.TP
-\-D
-Debugging.  Vim si mette in Modo "debugging" a partire
-dall'esecuzione del primo comando da uno script.
-.TP
-\-e
-Eseguire
-.B Vim
-in Modo Ex, come se il programma eseguito sia "ex".
-.TP
-\-E
-Eseguire
-.B Vim
-in Modo Ex migliorato, come se il programma eseguito sia "exim".
-.TP
-\-f
-Direttamente [Foreground].  Per la versione GUI,
-.B Vim
-non crea [fork] una nuova finestra, indipendente dalla shell di invocazione.
-Per l'Amiga,
-.B Vim
-non � fatto ripartire per aprire una nuova finestra.
-Opzione da usare quando
-.B Vim
-� eseguito da un programma che attende la fine della
-sessione di edit (ad es. mail).
-Sull'Amiga i comandi ":sh" e ":!" non sono disponibili.
-.TP
-\-\-nofork
-Direttamente [Foreground].  Per la versione GUI,
-.B Vim
-non crea [fork] una nuova finestra, indipendente dalla shell di invocazione.
-.TP
-\-F
-Se
-.B Vim
-� stato compilato con supporto FKMAP per editare file con orientamento
-destra-sinistra e tastiera con mappatura Farsi, questa opzione inizia
-.B Vim
-in Modo Farsi, cio� impostando 'fkmap' e 'rightleft'.
-Altrimenti viene dato un messaggio di errore e
-.B Vim
-termina in modo anormale.
-.TP
-\-g
-Se
-.B Vim
-� stato compilato con supporto GUI, questa opzione chiede di usarla.
-Se Vim � stato compilato senza supporto GUI viene dato un messaggio di errore e
-.B Vim
-termina in modo anormale.
-.TP
-\-h
-Un po' di aiuto su opzioni e argomenti che si possono dare invocando Vim.
-Subito dopo
-.B Vim
-esce.
-.TP
-\-H
-Se
-.B Vim
-� stato compilato col supporto RIGHTLEFT per editare file con orientamento
-destra-sinistra e tastiera con mappatura Ebraica, questa opzione inizia
-.B Vim
-in Modo Ebraico, cio� impostando 'hkmap' e 'rightleft'.
-Altrimenti viene dato un messaggio di errore e
-.B Vim
-termina in modo anormale.
-.TP
-\-i {viminfo}
-Se � abilitato l'uso di un file viminfo, questa opzione indica il nome
-del file da usare invece di quello predefinito "~/.viminfo".
-Si pu� anche evitare l'uso di un file .viminfo, dando come nome "NONE".
-.TP
-\-L
-Equivalente a \-r.
-.TP
-\-l
-Modo Lisp.
-Imposta le opzioni 'lisp' e 'showmatch'.
-.TP
-\-m
-Inibisce modifica file.
-Annulla l'opzione 'write'.
-� ancora possibile modificare un buffer [in memoria \- Ndt], ma non scriverlo.
-.TP
-\-M
-Modifiche non permesse.  Le opzioni 'modifiable' e 'write' sono annullate,
-in modo da impedire sia modifiche che riscritture.  Da notare che queste
-opzioni possono essere abilitate in seguito, permettendo cos� modifiche.
-.TP
-\-N
-Modo "Non-compatibile".  Annulla l'opzione 'compatible'.
-Cos�
-.B Vim
-va un po' meglio, ma � meno compatibile con Vi, anche in assenza di un
-file .vimrc.
-.TP
-\-n
-Inibisce l'uso di un file di swap.
-Il recupero dopo una caduta di macchina diventa impossibile.
-Utile per editare un file su un supporto molto lento (ad es. floppy).
-Il comando ":set uc=0" ha lo stesso effetto.
-Per abilitare il recupero usare ":set uc=200".
-.TP
-\-nb
-Diviene un Editor server per NetBeans.  Vedere la documentazione per dettagli.
-.TP
-\-o[N]
-Apri N finestre in orizzontale.
-Se N manca, apri una finestra per ciascun file.
-.TP
-\-O[N]
-Apri N finestre, in verticale.
-Se N manca, apri una finestra per ciascun file.
-.TP
-\-R
-Modo Read-only (Sola Lettura).
-Imposta l'opzione 'readonly'.
-Si pu� ancora modificare il buffer, ma siete protetti da una riscrittura
-involontaria.
-Se volete davvero riscrivere il file, aggiungete un punto esclamativo
-al comando Ex, come in ":w!".
-L'opzione \-R implica anche l'opzione \-n (vedere sotto).
-L'opzione 'readonly' pu� essere annullata con ":set noro".
-Vedere ":help 'readonly'".
-.TP
-\-r
-Lista file di swap, assieme a dati utili per un recupero.
-.TP
-\-r {file}
-Modo Recovery (ripristino).
-Il file di swap � usato per recuperare una sessione di edit finita male.
-Il file di swap � un file con lo stesso nome file del file di testo
-editato, col suffisso ".swp".
-Vedere ":help recovery".
-.TP
-\-s
-Modo silenzioso.  Solo quando invocato come "Ex" o quando l'opzione
-"\-e" � stata data prima dell'opzione "\-s".
-.TP
-\-s {scriptin}
-Lo script file {scriptin} � letto.
-I caratteri nel file sono interpretati come se immessi da voi.
-Lo stesso si pu� ottenere col comando ":source! {scriptin}".
-Se la fine del file di input viene raggiunta prima che Vim termini,
-l'ulteriore input viene preso dalla tastiera.
-.TP
-\-T {terminale}
-Dice a
-.B Vim
-quale tipo di terminale state usando.
-Utile solo se il terminale non viene riconosciuto correttamente da Vim.
-Dovrebbe essere un terminale noto a
-.B Vim
-(internamente) o definito nel file termcap o terminfo.
-.TP
-\-u {vimrc}
-Usa i comandi nel file {vimrc} per inizializzazioni.
-Tutte le altre inizializzazioni non sono eseguite.
-Usate questa opzione per editare qualche file di tipo speciale.
-Pu� anche essere usato per non fare alcuna inizializzazione dando
-come nome "NONE".
-Vedere ":help initialization" da vim per ulteriori dettagli.
-.TP
-\-U {gvimrc}
-Usa i comandi nel file {gvimrc} per inizializzazioni GUI.
-Tutte le altre inizializzazioni GUI non sono eseguite.
-Pu� anche essere usata per non fare alcuna inizializzazione GUI dando
-come nome "NONE".
-Vedere ":help gui-init" da vim per ulteriori dettagli.
-.TP
-\-V[N]
-Verboso.  Vim manda messaggi relativi agli script file che esegue
-e quando legge o scrive un file viminfo.  Il numero opzionale N � il valore
-dell'opzione 'verbose'.
-Il valore predefinito � 10.
-.TP
-\-v
-Inizia
-.B Vim
-in Modo Vi, come se il programma eseguibile fosse "vi".  Questo ha
-effetto solo quando Vim viene invocato con il nome "ex".
-.TP
-\-w {scriptout}
-Ogni carattere immesso viene registrato nel file {scriptout},
-finch� non uscite da
-.B Vim.
-Utile se si vuole creare uno script file da usare con "vim \-s" o
-":source!".
-Se il file {scriptout} esiste, quel che immettete viene aggiunto in fondo.
-.TP
-\-W {scriptout}
-Come \-w, ma uno script file esistente viene sovrascritto.
-.TP
-\-x
-Uso di cifratura nella scrittura dei file.  E' necessario immettere
-una chiave di cifratura.
-.TP
-\-X
-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".
-.TP
-\-\-
-Specifica la fine delle opzioni.
-Argomenti specificati dopo questo sono considerati nomi file.
-Si pu� usare per editare un file il cui nome inizi per '-'.
-.TP
-\-\-echo\-wid
-Solo con GUI GTK: Visualizza Window ID su "stdout".
-.TP
-\-\-help
-Vim d� un messaggio ed esce, come con l'argomento "\-h".
-.TP
-\-\-literal
-Considera i nomi passati come argomenti letterali, senza espandere
-metacaratteri.  Non necessario in Unix, la shell espande i metacaratteri.
-.TP
-\-\-noplugin
-Non caricare plugin.  Implicito se si specifica \-u NONE.
-.TP
-\-\-remote
-Connettersi a un server Vim e chiedere di editare i file elencati come altri
-argomenti.  Se non si trova un server viene dato un messaggio e i file sono
-editati nel Vim corrente.
-.TP
-\-\-remote\-expr {expr}
-Connettersi a un server Vim, valutare ivi {expr} e stampare il risultato
-su "stdout".
-.TP
-\-\-remote\-send {chiavi}
-Connettersi a un server Vim e spedirgli {chiavi}.
-.TP
-\-\-remote\-silent
-Come \-\-remote, ma senza avvisare se non si trova un server.
-.TP
-\-\-remote-wait
-Come \-\-remote, ma Vim non termina finch� i file non sono stati editati.
-.TP
-\-\-remote\-wait\-silent
-Come \-\-remote\-wait, ma senza avvisare se non si trova un server.
-.TP
-\-\-serverlist
-Lista i nomi di tutti i server Vim disponibili.
-.TP
-\-\-servername {nome}
-Usa {nome} come nome server.  Usato per il Vim corrente, a meno che sia
-usato con l'argomento \-\-remote, nel qual caso indica il server a cui
-connettersi.
-.TP
-\-\-socketid {id}
-Solo con GUI GTK: Usa il meccanismo GtkPlug per eseguire gvim in un'altra
-finestra.
-.TP
-\-\-version
-Stampa la versione di Vim ed esci.
-.SH AIUTO ONLINE
-Battere ":help" in
-.B Vim
-per iniziare.
-Battere ":help argomento" per ricevere aiuto su uno specifico argomento.
-Per esempio: ":help ZZ" per ricevere aiuto sul comando "ZZ".
-Usare <Tab> e CTRL\-D per completare gli argomenti
-(":help cmdline\-completion").
-Ci sono "tag" nei file di help per saltare da un argomento a un altro
-(simili a legami ipertestuali, vedere ":help").
-Tutti i file di documentazione possono essere navigati cos�.  Ad es.:
-":help syntax.txt".
-.SH FILE
-.TP 15
-/usr/local/lib/vim/doc/*.txt
-I file di documentazione di
-.B Vim
-.
-Usate ":help doc\-file\-list" per avere la lista completa.
-.TP
-/usr/local/lib/vim/doc/tags
-Il file di tags usato per trovare informazioni nei file di documentazione.
-.TP
-/usr/local/lib/vim/syntax/syntax.vim
-Inizializzazioni sintattiche a livello di sistema.
-.TP
-/usr/local/lib/vim/syntax/*.vim
-File di colorazione sintattica per vari linguaggi.
-.TP
-/usr/local/lib/vim/vimrc
-Inizializzazioni
-.B Vim
-a livello di sistema.
-.TP
-~/.vimrc
-Le vostre personali inizializzazioni di
-.B Vim
-.
-.TP
-/usr/local/lib/vim/gvimrc
-Inizializzazioni gvim a livello di sistema.
-.TP
-~/.gvimrc
-Le vostre personali inizializzazioni di gvim.
-.TP
-/usr/local/lib/vim/optwin.vim
-Script Vim usato dal comando ":options", un modo semplice
-per visualizzare e impostare opzioni.
-.TP
-/usr/local/lib/vim/menu.vim
-Inizializzazioni del men� gvim a livello di sistema.
-.TP
-/usr/local/lib/vim/bugreport.vim
-Script Vim per generare una segnalazione di errore.  Vedere ":help bugs".
-.TP
-/usr/local/lib/vim/filetype.vim
-Script Vim per determinare il tipo di un file a partire dal suo nome.
-Vedere ":help 'filetype'".
-.TP
-/usr/local/lib/vim/scripts.vim
-Script Vim per determinare il tipo di un file a partire dal suo contenuto.
-Vedere ":help 'filetype'".
-.TP
-/usr/local/lib/vim/print/*.ps
-File usati per stampa PostScript.
-.PP
-Per informazioni aggiornate [in inglese \- NdT] vedere la home page di Vim:
-.br
-<URL:http://www.vim.org/>
-.SH VEDERE ANCHE
-vimtutor(1)
-.SH AUTORE
-Buona parte di
-.B Vim
-� stato scritto da Bram Moolenaar, con molto aiuto da altri.
-Vedere ":help credits" in
-.B Vim.
-.br
-.B Vim
-� basato su Stevie, scritto da: Tim Thompson,
-Tony Andrews e G.R. (Fred) Walter.
-In verit�, poco o nulla � rimasto del loro codice originale.
-.SH BACHI
-Probabili.
-Vedere ":help todo" per una lista di problemi noti.
-.PP
-Si noti che un certo numero di comportamenti che possono essere considerati
-errori da qualcuno, sono in effetti causati da una riproduzione fin troppo
-fedele del comportamento di Vi.
-Se ritenete che altre cose siano errori "perch� Vi si comporta diversamente",
-date prima un'occhiata al file vi_diff.txt
-(o battere :help vi_diff.txt da Vim).
-Date anche un'occhiata alle opzioni 'compatible' e 'cpoptions.
diff --git a/runtime/doc/vim-pl.1 b/runtime/doc/vim-pl.1
deleted file mode 100644
index d506b33c98..0000000000
--- a/runtime/doc/vim-pl.1
+++ /dev/null
@@ -1,558 +0,0 @@
-.TH VIM 1 "2006 kwi 11"
-.SH NAME
-vim \- Vi rozbudowany, edytor tekstu dla programisty
-.SH SYNOPSIS
-.br
-.B vim
-[opcje] [plik ..]
-.br
-.B vim
-[opcje] \-
-.br
-.B vim
-[opcje] \-t znacznik
-.br
-.B vim
-[opcje] \-q [plik_b��du]
-.PP
-.br
-.B ex
-.br
-.B view
-.br
-.B gvim
-.B gview
-.B evim
-.B eview
-.br
-.B rvim
-.B rview
-.B rgvim
-.B rgview
-.SH OPIS
-.B Vim
-jest edytorem tekstu kompatybilnym z Vi. Mo�e by�
-u�ywany do edycji wszelkiego rodzaju plik�w tekstowych.
-U�yteczny zw�aszcza przy edycji program�w.
-.PP
-Posiada wiele usprawnie� w por�wnaniu z Vi: wielopoziomowe cofanie zmian,
-wiele okien i bufor�w, pod�wietlanie sk�adni, edycja linii polece�,
-uzupe�nianie nazw plik�w, pomoc on-line, wizualna selekcja, itd.
-Zobacz ":help vi_diff.txt" dla podsumowania r�nic pomi�dzy
-.B Vimem
-i Vi.
-.PP
-W czasie korzystania z
-.B Vima
-mo�na uzyska� obszern� pomoc z systemu pomocy on-line dzi�ki poleceniu ":help".
-Zobacz rozdzia� POMOC ON-LINE poni�ej.
-.PP
-Najcz�ciej
-.B Vim
-jest uruchamiany do edycji pojedynczego pliku poleceniem
-.PP
-	vim plik
-.PP
-Bardziej og�lnie
-.B Vim
-jest uruchamiany poprzez:
-.PP
-	vim [opcje] [lista plik�w]
-.PP
-Je�li brak listy plik�w edytor rozpocznie z pustym buforem. W innym
-wypadku istnieje dok�adnie jedna z czterech mo�liwo�ci by wybra� jeden
-lub wi�cej plik�w do edycji.
-.TP 12
-plik ..
-Lista nazw plik�w.
-Pierwsza nazwa b�dzie nazw� bie��cego pliku, kt�ry zostanie wczytany
-do bufora. Kursor zostanie umieszczony w pierwszym wierszu. Do
-kolejnych plik�w mo�na przej�� dzi�ki poleceniu ":next". By otworzy�
-plik, kt�rego nazwa zaczyna si� od my�lnika nale�y list� plik�w
-poprzedzi� "\-\-".
-.TP
-\-
-Plik do edycji jest wczytany ze standardowego wej�cia. Polecenia s�
-odczytywane ze standardowego wyj�cia b��d�w, kt�rym powinien by�
-terminal (tty).
-.TP
-\-t {znacznik}
-Plik do edycji i pocz�tkowa pozycja kursora zale�y od "znacznika",
-rodzaju etykiety goto.
-{znacznika} szuka si� w pliku tags, zwi�zany z nim plik staje si�
-plikiem bie��cym i wykonuje si� powi�zane polecenie.
-Zazwyczaj u�ywa si� tego sposobu dla program�w w C, w kt�rych wypadku
-{znacznik} mo�e by� nazw� funkcji.
-W efekcie plik zawieraj�cy okre�lon� funkcj� staje si� plikiem
-bie��cym a kursor jest umieszczony na pocz�tku funkcji.
-Zobacz ":help tag-commands".
-.TP
-\-q [plik_b��d�w]
-Zacznij w trybie quickFix.
-Plik [plik_b��d�w] zostaje zinterpretowany i poka�e si� pierwszy b��d.
-Je�li brak opcji [plik_b��d�w] nazwa pliku zostanie pobrana z opcji
-\&'errorfile' (domy�lnie "AztecC.Err" dla Amigi, "errros.err" dla innych
-system�w.
-Do kolejnych b��d�w mo�na przeskoczy� dzi�ki poleceniu ":cn".
-Zobacz ":help quickfix".
-.PP
-W zale�no�ci od wywo�ania
-.B Vim
-zachowuje si� inaczej (program mo�e by� ca�y czas tym samym
-plikiem).
-.TP 10
-vim
-"Normalny" spos�b, wszystko jest domy�lne.
-.TP
-ex
-Zacznij w trybie Ex.
-Przejd� do trybu Normalnego poleceniem ":vi".
-Mo�na tak�e uruchomi� poprzez argument "\-e".
-.TP
-view
-Zacznij w trybie tylko do odczytu. W ten spos�b b�dziesz chroniony
-przed zapisywaniem pliku. Mo�na tak�e uruchomi� poprzez argument
-"\-R".
-.TP
-gvim gview
-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�
-.B Vima.
-Mo�na tak�e uruchomi� poprzez argument "\-Z".
-.SH OPCJE
-Opcje mo�na poda� w dowolnej kolejno�ci, przed lub po nazwach plik�w.
-Opcje bez argument�w mo�na ��czy� po pojedynczym my�lniku.
-.TP 12
-+[num]
-W pierwszym pliku kursor zostanie umieszczony w wierszu "num".
-Je�li brak "num" kursor zostanie umieszczony w ostatnim wierszu.
-.TP
-+/{wz�r}
-W pierwszym pliku kursor zostanie umieszczony na pierwszym wyst�pieniu
-{wz�r}.
-Zobacz ":help search-pattern" by dowiedzie� si� jakie s� mo�liwe
-wzorce wyszukiwania.
-.TP
-+{polecenie}
-.TP
-\-c {polecenie}
-{polecenie} zostanie wykonane po tym jak wczyta si� pierwszy plik.
-{polecenie} jest interpretowane jako polecenie Ex.
-Je�li {poleceni} zawiera bia�e znaki musi by� umieszczone w podw�jnych
-cudzys�owach (zale�y to od u�ywanej pow�oki).
-Przyk�ad: Vim "+set si" main.c
-.br
-Uwaga: Mo�na u�y� do 10 polece� "+" lub "\-c".
-.TP
-\-S {plik}
-{plik} zostanie zinterpretowany po wczytaniu pierwszego pliku.
-Jest r�wnowa�ne \-c "source {plik}".
-{plik} nie mo�e zaczyna� si� '\-'.
-Je�li nie podano {plik} zostanie u�yty "Session.vim" (dzia�a tylko
-wtedy je�li \-S jest ostatnim argumentem).
-.TP
-\-\-cmd {polecenie}
-Podobne do "\-c", ale polecenie jest wykonywane tu� przed
-interpretacj� jakiegokolwiek pliku vimrc.
-Mo�na u�y� do 10 takich polece�, niezale�nie od polece� od "\-c"
-.TP
-\-A
-Je�li
-.B Vim
-zosta� skompilowany ze wsparciem dla j�zyk�w arabskich (edycja od
-prawej do lewej i arabska mapa klawiatury) ta opcja uruchamia
-.B Vima
-w trybie arabskim, np. ustawia si� opcja 'arabic'. W innym wypadku
-pojawi si� komunikat b��du i
-.B Vim
-zako�czy dzia�anie.
-.TP
-\-b
-Tryb binarny.
-Ustawi si� kilka opcji, kt�re umo�liwi� edycj� plik�w binarnych lub
-wykonywalnych.
-.TP
-\-C
-Kompatybilny. Ustawia opcj� 'compatible'.
-W ten spos�b 
-.B Vim
-b�dzie zachowywa� si� jak Vi, nawet je�li istnieje plik .vimrc.
-.TP
-\-d
-Uruchom w trybie diff.
-Powinno si� u�y� dw�ch, trzech lub czterech nazwy plik�w jako argument�w.
-.B Vim
-otworzy wszystkie te pliki i poka�e r�nice mi�dzy nimi.
-Dzia�a jak vimdiff(1).
-.TP
-\-d {urz�dzenie}
-Otw�rz {urz�dzenie} by u�ywa� jako terminal.
-Tylko na Amidze.
-Przyk�ad:
-"\-d con:20/30/600/150".
-.TP
-\-D
-Debugowanie. Przejd� do trybu debugowanie wykonuj�c pierwsze polecenie
-ze skryptu.
-.TP
-\-e
-Uruchom
-.B Vima
-w trybie Ex, dzia�a tak samo jakby wywo�ano program jako "ex".
-.TP
-\-E
-Uruchom
-.B Vima
-w ulepszonym trybie Ex, dzia�a tak samo jakby wywo�ano program jako
-"exim".
-.TP
-\-f
-Pierszy plan. Dla wersji GUI.
-.B Vim
-nie nie oddzieli si� od pow�oki w jakiej zosta� uruchomiony. Na Amidze
-.B Vim
-nie jest uruchomiony ponownie by otworzy� nowe okno.
-Opcja powinna by� u�yta kiedy
-.B Vim
-jest wywo�ywany przez program, kt�ry ma zaczeka� na koniec sesji (np.
-mail).
-Na Amidze polecenia ":sh" i ":!" nie b�d� dzia�a�.
-.TP
-\-\-nofork
-Pierwszy plan. Dla wersji GUI.
-.B Vim
-nie oddzieli si� od pow�oki w jakiej zosta� uruchomiony.
-.TP
-\-F
-Je�li Vim zosta� skompilowany ze wsparciem FKMAP dla edycji tekst�w od
-prawej do lewej i mapowania klawiatury Farsi, ta opcja uruchomi
-.B Vima
-w trybie Farsi, np. zostawi� ustawione opcje 'fkmap' i 'rightleft'.
-W innym wypadku pojawi si� komunikat b��du i
-.B Vim
-zako�czy dzia�anie.
-.TP
-\-g
-Je�li
-.B Vim
-zosta� skompilowany ze wsparciem dla GUI ta opcja uruchomi GUI.
-W innym wypadku pojawi si� komunikat b��du i
-.B Vim
-zako�czy dzia�anie.
-.TP
-\-h
-Wy�wietli kr�tk� pomoc o argumentach linii polece� i opcjach. Potem
-.B Vim
-zako�czy dzia�anie.
-.TP
-\-H
-Je�li
-.B Vim
-zosta� skompilowany ze wsparciem RIGHTLEFT dla edycji od prawej do
-lewej oraz ma mapowanie klawiatury dla hebrajskiego, ta opcja uruchomi
-.B Vima
-w trybie hebrajskim, np. ustawi opcje 'hkmap' i 'rightleft'.
-W innym wypadku pojawi si� komunikat b��du i
-.B Vim
-zako�czy dzia�anie.
-.TP
-\-i {viminfo}
-Kiedy
-.B Vim
-u�ywa pliku viminfo ta opcja wska�e jakiego pliku u�y� zamiast
-domy�lnego "~/.viminfo".
-Mo�na te� omin�� u�ycie pliku .viminfo przez podanie nazwy "NONE".
-.TP
-\-L
-To samo co \-r.
-.TP
-\-l
-Tryb Lisp.
-Ustawia opcje 'lisp' i 'showmatch'.
-.TP
-\-m
-Zmiana pliku jest niemo�liwa.
-Przestawia opcj� 'write'.
-Mo�na zmienia� zawarto�� bufora, ale zapisanie pliku nie jest
-mo�liwe.
-.TP
-\-M
-Opcje 'modifiable' i 'write' zostan� wy��czone, tak wi�c zmiany
-w pliku oraz ich zapisanie nie s� mo�liwe. Warto�� tych opcji mo�na
-zmieni�.
-.TP
-\-N
-Tryb niekompatybilny. Przestawia opcj� 'compatible'. Dzi�ki temu
-.B Vim
-b�dzie zachowywa� si� odrobin� lepiej, ale mniej zgodnie z Vi nawet
-je�li nie istnieje plik .vimrc.
-.TP
-\-n
-Nie powstanie plik wymiany. Odzyskanie pliku po wypadku nie b�dzie
-mo�liwe.
-Wygodne je�li instnieje potrzeba edycji na bardzo wolnym medium (np.
-dyskietce). Ten cel mo�na osi�gn�� tak�e przez ":set uc=0". Mo�na
-odwr�ci� przez ":set uc=200".
-.TP
-\-nb
-Uruchom jako serwer edytora dla NetBeans. Zobacz dokumentacj� by
-dowiedzie� si� wi�cej.
-.TP
-\-o[N]
-Otw�rz N okien w stosie.
-Kiedy brak N, otw�rz jedno okno dla ka�dego pliku.
-.TP
-\-O[N]
-Otw�rz N okien obok siebie.
-Kiedy brak N, otw�rz jedno okno dla ka�dego pliku.
-.TP
-\-p[N]
-Otw�rz N kart.
-Kiedy brak N, otw�rz jedn� kart� dla ka�dego pliku.
-.TP
-\-R
-Tryb tylko do odczytu.
-Zostanie ustawiona opcja 'readonly'.
-Ca�y czas mo�na zmienia� bufor, ale b�dzie istnia�a blokada by chroni�
-przed przypadkowym zapisaniem pliku.
-Je�li chcesz zapisa� plik dodaj wykrzyknik do polecenia Ex, np. ":w!".
-Opcja \-R implikuje opcj� \-n (zobacz poni�ej).
-Opcja 'readonly' mo�e zosta� przestawiona poprzez ":set noro".
-Zobacz ":help 'readonly'".
-.TP
-\-r
-Wypisz list� plik�w wymiany razem z informacjami o nich.
-.TP
-\-r {plik}
-Tryb odzyskiwania danych.
-Plik wymiany zostanie wykorzystany do odzyskania gwa�townie przerwanej sesji.
-Plik wymiany to plik z tak� sam� nazw� co plik oryginalny z dodanym ".swp".
-Zobacz ":help recovery".
-.TP
-\-s
-Tryb cichy. Rozpocz�ty tylko kiedy uruchomiony jako "Ex" lub opcja
-"\-e" zosta�a podana przed opcj� "\-s".
-.TP
-\-s {skrypt}
-Zostanie wczytany plik {skrypt}.
-Znaki w pliku zostan� zinterpretowane jakby by�y wpisywane.
-To samo mo�na osi�gn�� poprzez polecenie ":source! {skrypt}".
-Je�li osi�gni�to koniec pliku zanim edytor zako�czy� dzia�anie, dalsze
-znaki odczytywane s� z klawiatury.
-.TP
-\-T {terminal}
-Przekazuje
-.B Vimowi
-nazw� terminalu jakiego u�ywasz.
-Wymagane tylko wtedy je�li nie dzia�a automatycznie.
-Powinien by� to terminal znany
-.B Vimowi
-(builtin) lub zdefiniowany w plikach termcap lub terminfo.
-.TP
-\-u {vimrc}
-U�yj polece� z pliku {vimrc} w czasie uruchamiania.
-Wszystkie inne mo�liwe pliki uruchamiania zostan� pomini�te.
-U�ywaj do edytowania plik�w specjalnych.
-Mo�na pomin�� tak�e wszystkie mo�liwe pliki uruchamiania poprzez
-podanie nazwy "NONE".
-Zobacz ":help initialization" by pozna� wi�cej szczeg��w.
-.TP
-\-U {gvimrc}
-U�yj polece� z pliku {gvimrc} w czasie uruchamiania GUI.
-Wszystkie inne mo�liwe pliki uruchamiania GUI zostan� pomini�te.
-Mo�na pomin�� tak�e wszystkie mo�liwe pliki uruchamiania GUI poprzez
-podanie nazwy "NONE".
-Zobacz ":help gui-init" by pozna� wi�cej szczeg��w.
-.TP
-\-V[N]
-Tryb gadatliwy. Wypisz wiadomo�ci o tym jaki pliki s� wczytywane
-i o informacjach pobieranych i dodawanych do pliku viminfo. Opcjonalny
-argument N jest warto�ci� 'verbose'. Domy�lnie 10.
-.TP
-\-v
-Uruchom
-.B Vima
-w trybie Vi, tak jakby program by� nazwany "vi". Ma znaczenie
-tylko wtedy je�li program nazwany jest "ex".
-.TP
-\-w {plik}
-Wszystkie wci�ni�cia klawiszy, a� do zako�czenia dzia�ania programu,
-s� zapisywane w {plik} .
-U�yteczne je�li chce si� stworzy� skrypt do u�ycia z "vim \-s" lub
-":source!".
-Je�li {plik} istnieje, znaki s� dopisywane.
-.TP
-\-W {plik}
-Podobnie do \-w, ale istniej�cy plik jest nadpisywany.
-.TP
-\-x
-U�yj szyfrowania podczas zapisywania plik�w. Zostaniesz poproszony
-o podanie klucza.
-.TP
-\-X
-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".
-.TP
-\-\-
-Oznacza koniec opcji.
-Argumenty po tej opcji b�d� traktowane jak nazwy plik�w. U�ywa si� do
-otwierania plik�w, kt�rych nazwy zaczynaj� si� od '\-'.
-.TP
-\-\-echo\-wid
-Wy��cznie GTK GUI: wypisz ID okna na standardowe wyj�cie.
-.TP
-\-\-help
-Wy�wietl informacj� o pomocy i zako�czy, to samo co"\-h".
-.TP
-\-\-literal
-Potraktuj nazwy plik�w dos�ownie i nie rozwi�zuj kwantyfikator�w. Nie
-ma znaczenia na Uniksach gdzie pow�oka rozwi�zuje kwantyfikatory.
-.TP
-\-\-noplugin
-Pomi� �adowanie wtyczek. Implikowane przy \-u NONE.
-.TP
-\-\-remote
-Po��cz si� z serwerem Vima i edytuj w nim reszt� plik�w podanych jako
-argumenty. Je�li nie znaleziono serwera zostanie zg�oszony b��d a pliki zostan�
-otwarte w bie��cym Vimie.
-.TP
-\-\-remote\-expr {wyra�enie}
-Po��cz z serwerem Vima, rozwi�� w nim {wyra�enie} i wypisz rozwi�zanie
-na standardowe wyj�cie.
-.TP
-\-\-remote\-send {klawisze}
-Po��cz z serwerem Vima i wy�lij do niego {klawisze}.
-.TP
-\-\-remote\-silent
-Tak samo jak \-remote, ale bez ostrze�enia kiedy nie znaleziono
-serwera.
-.TP
-\-\-remote\-wait
-Tak samo jak \-remote, ale Vim nie zako�czy dop�ki pliki pozostan�
-otwarte.
-.TP
-\-\-remote\-wait\-silent
-Tak samo jak \-\-remote\-wait, ale bez ostrze�enie kiedy nie
-znaleziono serwera.
-.TP
-\-\-serverlist
-Wypisz nazwy wszystkich serwer�w Vima jakie mo�na znale��.
-.TP
-\-\-servername {nazwa}
-U�yj {nazwa} jako nazwy serwera. Wykorzystane dla bie��cego Vima o ile
-nie po��czone z argumentem \-\-remote, wtedy jest to nazwa serwera do
-po��czenia.
-.TP
-\-\-socketid {id}
-Wy��cznie GTK GUI: U�yj mechanizmu GtkPlug by uruchomi� gvima w innym
-oknie.
-.TP
-\-\-version
-Wypisz informacj� o wersji i zako�cz.
-.SH POMOC ON-LINE
-By rozpocz�� wpisz ":help" w
-.B Vimie
-Wpisz ":help temat" by uzyska� pomoc na okre�lony temat.
-Przyk�ad: ":help ZZ" by uzyska� pomoc na temat polecenia "ZZ".
-U�yj <Tab> i CTRL\-D aby uzupe�ni� tematy (":help
-cmdline\-completion"). W plikach pomocy istniej� znaczniki by u�atwi�
-skakanie z jednego miejsca do innego (rodzaj link�w hipertekstowych,
-zobacz ":help").
-Mo�na w ten spos�b zobaczy� ca�� dokumentacj�, np. ":help syntax.txt".
-.SH PLIKI
-.TP 15
-/usr/local/lib/vim/doc/*.txt
-Dokumentacja
-.B Vima
-U�yj ":help doc\-file\-list" aby uzyska� pe�n� list�.
-.TP
-/usr/local/lib/vim/doc/tags
-Plik znacznik�w s�u�y do znajdowania informacji w plikach dokumentacji.
-.TP
-/usr/local/lib/vim/syntax/syntax.vim
-Globalne uruchamianie pod�wietlania sk�adni.
-.TP
-/usr/local/lib/vim/syntax/*.vim
-Pliki sk�adni dla r�nych j�zyk�w.
-.TP
-/usr/local/lib/vim/vimrc
-Globalny plik uruchamiania
-.B Vima
-.TP
-~/.vimrc
-Osobiste parametry uruchamiania
-.B Vima
-.TP
-/usr/local/lib/vim/gvimrc
-Globalne uruchamianie gvima.
-.TP
-~/.gvimrc
-Osobiste parametry uruchamiania gvima.
-.TP
-/usr/local/lib/vim/optwin.vim
-Skrypt u�ywany w poleceniu ":options", dobry spos�b do przegl�dania
-i ustawiania opcji.
-.TP
-/usr/local/lib/vim/menu.vim
-Globalne uruchamianie menu gvima.
-.TP
-/usr/local/lib/vim/bugreport.vim
-Skrypt s�u��cy do tworzenia raport�w o b��dach. Zobacz ":help bugs".
-.TP
-/usr/local/lib/vim/filetype.vim
-Skrypt do wykrywania typu pliku wed�ug jego nazwy. Zobacz ":help 'filetype'".
-.TP
-/usr/local/lib/vim/scripts.vim
-Skrypt do wykrywania typu pliku wed�ug jego zawarto�ci. Zobacz ":help 'filetype'".
-.TP
-/usr/local/lib/vim/print/*.ps
-Pliku u�ywane do drukowania PostScriptu.
-.PP
-Naj�wie�sze wiadomo�ci na stronie
-.B Vima:
-.br
-<URL:http://www.vim.org/>
-.SH ZOBACZ TAK�E
-vimtutor(1)
-.SH AUTOR
-.B Vim
-zosta� napisany przez Brama Moolenaara z du�� pomoc� innych os�b.
-Zobacz ":help credits" w
-.B Vimie.
-.br
-.B Vim
-bazuje na Steviem, nad kt�rym pracowali: Tim Thompson, Tony Andrews
-i G.R. (Fred) Walter.
-Ma�o ju� zosta�o z oryginalnego kodu.
-.SH B��DY
-Prawdopodobne.
-Zobacz ":help todo" by pozna� list� znanych problem�w.
-.PP
-Pami�taj �e pewna ilo�� problem�w, kt�re mog� by� uznawane przez
-niekt�rych ludzi za b��dy s� w rzeczywisto�ci spowodowane wierno�ci�
-w odtwarzaniu zachowania Vi.
-Je�li s�dzisz, �e inne rzeczy s� b��dami "poniewa� Vi robi to
-inaczej", powiniene� przyjrze� si� bli�ej plikowi vi_diff.txt (lub
-wpisa� ":help vi_diff.txt" w Vimie).
-Sprawd� tak�e opis opcji 'compatible' i 'cpoptions'.
diff --git a/runtime/doc/vim-ru.1 b/runtime/doc/vim-ru.1
deleted file mode 100644
index dfcb3ece98..0000000000
--- a/runtime/doc/vim-ru.1
+++ /dev/null
@@ -1,489 +0,0 @@
-.TH VIM 1 "2002 Feb 22"
-.SH ���
-vim \- Vi IMproved (���������� Vi), ��������� �������� ��� �������������
-.SH ��������� ������
-.br
-.B vim
-[�����] [���� ..]
-.br
-.B vim
-[�����] \-
-.br
-.B vim
-[�����] \-t �����
-.br
-.B vim
-[�����] \-q [���� ������]
-.PP
-.br
-.B ex
-.br
-.B view
-.br
-.B gvim
-.B gview
-.br
-.B rvim
-.B rview
-.B rgvim
-.B rgview
-.SH ��������
-.B Vim
--- ��������� ��������, �������-����������� � Vi.
-�� ����� ���� ����������� ��� ������ ���� ����� �������� ������.
-�������� �� ����� ��� ������ �������� ������� ��������.
-.PP
-�� ��������� � Vi, 
-.B Vim
-����� ����� ������������������: ������������ ������ ��������,
-��������������� ���� � �������, ��������� ����������, ������ ��������� ������,
-�������������� �ͣ� ������, ���������� �������, ���������� ��������� � �.�.
-��. ":help vi_diff.txt" ��� ��������� ������� ������ �������� �����
-.B Vim
-� Vi.
-.PP
-�� ����� ������ �
-.B Vim
-����� �������� ������� � ������� ������� ���������� ������� (������� ":help").
-��. ������ "���������� �������" ���� �� ������.
-.PP
-���� �����
-.B Vim
-��������� ��� ������ ������ ����� ��� ������ �������
-.PP
-	vim ����
-.PP
-� ����� ���� ������� �������
-.B Vim
-�������� ���:
-.PP
-	vim [�����] [������ ������]
-.PP
-���� ������ ������ �����������, �������� ���Σ� ������ � ������ �������.
-� ��������� ������ ��� ����� ������ ���� ������� ����� �� ��������� ����ң� ��������:
-.TP 12
-���� ..
-������ �ͣ� ������.
-������ ���� ����� �������� �������� � �������� � �����. ������ ����� ����ݣ�
-� ������ ������ ������. ������ � ������ ������ ����� ���� ��������̣� ���
-������ ������� ":next". ����� ������� ����, ��� �������� ���������� � �������
-"�����" (-), ����� ������� ������ ���������� ��������� "--".
-.TP
-\-
-���� ����� �������� �� ������ ������������ �����. ������� ����� �����������
-�� ������������ ������ ����������� (stderr), ������� ������ ���� 
-����������.
-.TP
-\-t {�����}
-��� ����� � ��������� ������� ������� ������� �� "�����", ������� �� ����� goto.
-{�����} ������ � ����� �����, ��������������� ���� ���������� ��������, � 
-��������������� ������� �����������.
-���� ����� ������������ � ���������� �� ����� ��, ��� {�����} ����� ���� ������
-�������.
-����, ���������� �������, ���������� ��������, � ������ ���������� � ������ �������.
-��. ":help tag-commands".
-.TP
-\-q [���� ������]
-������ ������ � ������ �������� �����������.
-��� ���� ����������� [���� ������] � ������ ������ ��������� �� �����.
-���� [���� ������] �� ������, ��� ����� ��ң��� �� �������� ����� 'errorfile'
-(�� ���������: "AztecC.Err" ��� Amiga, "errors.err" ��� ������ ������).
-� ��������� ������� ����� ������� �� ������� ":cn".
-��. ":help quickfix".
-.PP
-.B Vim
-��ģ� ���� ��-������� � ����������� �� ����� ������� (����������� ���� �����
-���� ����� � ��� ��).
-.TP 10
-vim
-"����������" ������, �ӣ �� ���������.
-.TP
-ex
-������ � ������ Ex. ��� �������� � ���������� �����
-���������� ��������� ������� ":vi". ����� Ex ��������
-����� ���� "\-e".
-.TP
-view
-������ � ������ "������ ��� ������". �� ������ �������� �� ��������� ������ 
-�����. �� �� ����� ����� ������� ������ "\-R".
-.TP
-gvim gview
-������ � ����������� �����������. ����������� � ����� ����.
-�� �� ����� ����� ������� ��� ������� � ������ "\-g".
-.TP
-rvim rview rgvim rgview
-��� � ���������� �������, �� � �������������. ������ ��������� ������� ��������
-��� ���������������� ������
-.B Vim.
-������ ��������� "r" ����� ������������ ���� "\-Z".
-.SH �����
-����� ����� ���� ������� � ����� �������, �� ��� ����� �ͣ�
-������. ����� ��� ���������� ����� ���� ���������� ��� �����
-�������.
-.TP 12
-+[�����]
-� ������ ����� ������ ����� ����ݣ� �� ������ � ��������� �������.
-���� "�����" �� ������, ������ ����� ����ݣ� �� ��������� ������.
-.TP
-+/{������}
-� ������ ����� ������ ����� ����ݣ� �� ����� ������� ����������
-� ��������� ��������. ��. ":help search-pattern" ��� ���������
-������ ���������� ��������.
-.TP
-+{�������}
-.TP
-\-c {�������}
-{�������} ����������� ����� �������� ������� ����� ��� ������� Ex.
-���� {�������} �������� �������, �� ��� ������ ���� ��������� �
-������� ������� (� ����������� �� ������������ ��������).
-������: vim "+set si" main.c
-.br
-����������: ����� ��������� �� ������ ������ "+" ��� "\-c".
-.TP
-\-\-cmd {�������}
-��� "\-c", �� ������� ����������� ����� ���������� ������ �����
-�������� (vimrc).
-����� ��������� �� ������ ����� ������, ���������� �� ����������
-������ "\-c".
-.TP
-\-A
-����
-.B Vim
-��� ������ � ���������� ��������� ����� ��� ������ ������,
-��������� ������ ������, � � ���������� �������� ����������,
-���� ���� ���������
-.B Vim
-� �������� ������, � ���������� ������ 'arabic'. � ��������� 
-������
-.B Vim
-��������� ������ � �������.
-.TP
-\-b
-�������� �����.
-������������ ��������� ��������� �����, �������� ��������� ������
-��������� ��� ������������ �����.
-.TP
-\-C
-����� �������������. �������� ����� 'compatible'.
-.B Vim
-����� �������� ����� ��� Vi, ���� ���� ���������� ���� .vimrc.
-.TP
-\-d
-����� ������ ��������.
-������ ���� ������� ��� ��� ��� ����� �����.
-.B Vim
-������� ��� ����� � ������� �������� ����� ����
-(��� vimdiff(1)).
-.TP
-\-d {����������}
-������� {����������} ��� ������������� � �������� ��������� (������ �� Amiga).
-������:
-"\-d con:20/30/600/150".
-.TP
-\-e
-���������
-.B Vim
-� ������ Ex, ��� ����� ����������� ���� ����� ��� "ex".
-.TP
-\-f
-����� ��������� ����������. ������
-.B Vim
-� ����������� ����������� �� ����� ��������� � �����������
-�� ����������� ţ ��������. �� ��������� Amiga
-.B Vim
-�� ����� ��������� ����� ����. ���� ���� ����� ������������,
-�����
-.B Vim
-����������� ����������, ������� ������ ����� ����������
-������ ������ (��������, ��������� ��� ������ � ����������� ������).
-�� ��������� Amiga ������� ":sh" � ":!" �� ����� ��������.
-.TP
-\-\-nofork
-����� ��������� ����������. ������
-.B Vim
-� ����������� ����������� �� ����� ��������� � �����������
-�� ����������� ţ ��������.
-.TP
-\-F
-����
-.B Vim
-��� ������ � ���������� FKMAP ��� ������ ������ ������ ������
-� �������� ���������� ��� ����� �����, ���� ���� ���������
-.B Vim
-� ������ �����, ����� ������, � ����ޣ����� ������� 
-\&'fkmap' � 'rightleft'.
-� ��������� ������
-.B Vim
-��������� ������ � ���������� �� ������.
-.TP
-\-g
-����
-.B Vim
-��� ������ � ���������� ������������ ����������, ���� ����
-�������� ����������� ���������. � ��������� ������
-.B Vim
-��������� ������ � ���������� �� ������.
-.TP
-\-h
-������� ������� ���������� �� ���������� � ������ ��������� ������.
-����� �����
-.B Vim
-��������� ������.
-.TP
-\-H
-����
-.B Vim
-��� ������ � ���������� ������ ������ ������ ������
-� �������� ���������� ��� ������, ���� ���� ���������
-.B Vim
-� ������ ������, ����� ������, � ����ޣ����� ������� 'hkmap' � 'rightleft'.
-� ��������� ������
-.B Vim
-��������� ������ � ���������� �� ������.
-.TP
-\-i {viminfo}
-���� ������������ ���� viminfo, �� ���� ���� ������ ��� ������ ����� (������
-"~/.viminfo" �� ���������). ����� ����� �������� ������������� ����� viminfo
-��ԣ� �������� ����� "NONE".
-.TP
-\-L
-�� ��, ��� � \-r.
-.TP
-\-l
-����� Lisp. ���������� ����� 'lisp' � 'showmatch'.
-.TP
-\-m
-��������� ������ ���������. ��� ���� ����������� ����� 'write', �������
-������ ������ ���������� �����������.
-.TP
-\-N
-����� �������� �������������. ����������� 'compatible'.
-.B Vim
-����� �������� �����, �� �� ����� ��������� ��������� � Vi, ���� ����
-����������� ���� �������� �������� (.vimrc).
-.TP
-\-n
-�� ������������ ����-����. �������������� ��� ���� � ������ ����� ����������.
-������ ��� ������ ����� �� ����� ��������� �������� (��������, ������ �����).
-�� �� ����� ����� ������� �������� ":set uc=0". ������ -- ":set uc=200".
-.TP
-\-o[N]
-������� N ����, �����̣���� �� �����������. ���� N �� �������, �� ����������� 
-�� ������ ���� �� ������ ����.
-.TP
-\-O[N]
-������� N ����, �����̣���� �� ���������. ���� N �� �������, �� ����������� 
-�� ������ ���� �� ������ ����.
-.TP
-\-R
-����� "������ ��� ������". ���������� ����� 'readonly'.
-���� � ������ �������� ��� ��������������, �� ��� ����� �� ����� ������
-�������� ������������. ��� ���������� ����� ���������� �������� ���������������
-���� � ��������������� ������� Ex (��������, ":w!").
-���� "\-R" ������������� �����, ��� ������������ � ���� "\-n" (��. ����).
-����� 'readonly' ����� ���� ��������� �� ������� ":set noro".
-��. ":help 'readonly'".
-.TP
-\-r
-������� ������ ����-������ � ���������� �� �� ������������� ��� �������������� ����� ����.
-.TP
-\-r {����}
-����� ��������������.
-��� �������������� ����� ���� ����� ����������� ����-����.
-����-���� ����� �� �� ���, ��� � ��������� ����, �� � ����������� ���������� ".swp".
-��. ":help recovery".
-.TP
-\-s
-����� �����. ������ ��� ������� ��� "Ex" ��� ���� ����� "\-s" ������ ���� "\-e".
-.TP
-\-s {scriptin}
-����������� ���� �������� {scriptin}. ��� ����, ���������� ����� ��������������
-� ���� ������, ��� ���� �� ��� ���� ������� �� �������. 
-�� �� ����� ����������� �������� ":source! {scriptin}".
-���� ����� ����� ����������� �� ���������� ������ ���������, �� � ���������� 
-���� �������������� � ����������.
-.TP
-\-T {terminal}
-��������
-.B Vim
-��� ������������� ���������. ���������� ������ � ��� ���������, ����� 
-�������������� ����������� ��������� �� ��������. ��� ��������� ������ ���� 
-��������
-.B Vim
-(�������� � ����) ��� ���������� � ������ termcap ��� terminfo.
-.TP
-\-u {vimrc}
-������������ ������� �� ����� �������� {vimrc} ��� ���������.
-��� ��������� ����� �������� ������������.
-������ ��� �������������� ����������� ����� ������.
-����� �������� ������������� ��������� �������� ������, ����� ������������
-��� "NONE". ��. ":help initialization".
-.TP
-\-U {gvimrc}
-������������ ������� �� ����� �������� {gvimrc} ��� ��������� ������������ 
-����������.
-��� ��������� ����� �������� ��� ������������ ���������� ������������.
-����� �������� ������������� ��������� �������� ������������ ���������� ������, 
-����� ������������ ��� "NONE". ��. ":help gui-init".
-.TP
-\-V
-"���������" �����. �������� ��������� � ���, ����� ����� ��������, � �
-������-������ ����� viminfo.
-.TP
-\-v
-���������
-.B Vim
-� ������ Vi, ��� ����� ����������� ���� ����� ��� "vi". ����� ����� ������ ����
-����������� ���� ����� ��� "ex".
-.TP
-\-w {scriptout}
-��� �������, ���ģ���� � ���������� ������ �� ������� ���������� ������, 
-������������ � ���� {scriptout}.
-������ � ��� ������, ����� �� ������ ������� ���� �������� ��� ������������ 
-������������� � "vim \-s" ��� ":source!". ���� ���� {scriptout} ��� ����������, 
-�� ����� ������� ����� ����������� � ����� �����.
-.TP
-\-W {scriptout}
-��� "\-w", �� ��� ������������ ���� ����� �����������.
-.TP
-\-x
-��������� ������������ �����. ����� ������ ����������� ������ ������.
-.TP
-\-X
-�� ������������ � X-�������. �������� �������� �� �������, �� ������ �����������
-������������� ��������� ���� � ������ ������.
-.TP
-\-Z
-������������ �����. �������� ��� ��, ��� � ���������, ������������ � "r".
-.TP
-\-\-
-����� ������. ��� ��������� ��������� ��������������� ��� ����� ������.
-����� ���� ������������ ��� ������ ������, ����� ������� ���������� � ������.
-.TP
-\-\-help
-������� ������� ������� � ��������� ������. �� ��, ��� � "\-h".
-.TP
-\-\-version
-������� ���������� � ������ ��������� � ��������� ������.
-.TP
-\-\-remote
-������������ � ������� Vim � ��������� ��� ������� �����, ��������� �
-����������� ����������. ���� ������ �� ������, ��������� ��������������,
-� ����� �������� � ������� ����� Vim.
-.TP
-\-\-remote\-expr {���������}
-������������ � ������� Vim � ��������� �� Σ� ��������� {���������}. 
-��������� ���������� ����� ������� � ����� ������������ ������ (stdout).
-.TP
-\-\-remote\-send {�����}
-������������ � ������� Vim � �������� ��� ��������� {�����}.
-.TP
-\-\-remote\-silent
-��� "\-\-remote", �� ��� ������ ��������������, ���� ������ �� ������.
-.TP
-\-\-remote\-wait
-��� "\-\-remote", �� Vim �� ����� ��������� ������ �� ��� ���, ���� �� ����� 
-��������� ������ ���� ������.
-.TP
-\-\-remote\-wait\-silent
-��� "\-\-remote\-wait", �� ��� ������ ��������������, ���� ������ �� ������.
-.TP
-\-\-serverlist
-������� ������ ���� ��������� �������� Vim.
-.TP
-\-\-servername {���}
-������������ ��������� {���} � �������� ����� �������. ���� ���� 
-"\-\-remote" �� ������, �� {���} ������������� ������ ����� Vim, 
-� ��������� ������ ��������� �� ��� �������, � �������� ������� 
-������������.
-.TP
-\-\-socketid {id}
-������ ��� ������������ ���������� GTK: ������������ �������� GtkPlug ���
-������� gvim � ��������� ����.
-.TP
-\-\-echo\-wid
-������ ��� ������������ ���������� GTK: ������� ������������� ���� (Window ID)
-� ����� ������������ ������ (stdout).
-.SH ���������� �������
-��� ������, �������� ������� ":help".
-������� ":help ����", ����� �������� ������� �� ���������� ����.
-��������, ������� ":help ZZ" ������� ���������� � ������� "ZZ".
-����������� <Tab> � CTRL-D ��� ��������������� ����������
-�������� ��� (":help cmdline-completion").
-��� �������� ����������� �� ����������� ������������ ����� (���-�� 
-����� �������������� ������, ��. ":help"). ����� ������� ����� 
-������������� ��� ����� �������, �������� ":help syntax.txt".
-.SH �����
-.TP 15
-/usr/local/lib/vim/doc/*.txt
-����� �����������
-.B Vim.
-��. ":help doc-file-list" ��� ��������� ������� ������.
-.TP
-/usr/local/lib/vim/doc/tags
-���� �����, ������������ ��� ������ ���������� � ������ �������.
-.TP
-/usr/local/lib/vim/syntax/syntax.vim
-��������� ��������� ����������.
-.TP
-/usr/local/lib/vim/syntax/*.vim
-����� ���������� ��� ������ ������.
-.TP
-/usr/local/lib/vim/vimrc
-��������� ���������
-.B Vim.
-.TP
-/usr/local/lib/vim/gvimrc
-��������� ��������� ������������ ����������.
-.TP
-/usr/local/lib/vim/optwin.vim
-��������, ������������ ��� ���������� ������� ":options". 
-������� ������ ������������� � �������� ���������.
-.TP
-/usr/local/lib/vim/menu.vim
-��������� ��������� ���� ��� gvim.
-.TP
-/usr/local/lib/vim/bugreport.vim
-�������� ��� �������� ��ޣ�� �� ������������ ������. ��. ":help bugs".
-.TP
-/usr/local/lib/vim/filetype.vim
-�������� ��� ����������� ���� ����� �� �����. ��. ":help 'filetype'".
-.TP
-/usr/local/lib/vim/scripts.vim
-�������� ��� ����������� ���� ����� �� �����������. ��. ":help 'filetype'".
-.TP
-/usr/local/lib/vim/print/*.ps
-����� ��� ������ PostScript.
-.PP
-����� ������ ���������� -- �� ����� VIM:
-.br
-<URL:http://www.vim.org/>
-.SH ������ �����
-vimtutor(1)
-.SH ������
-������� �����
-.B Vim
-������� ������ ����������� (Bram Moolenaar), �������� �������� �������� 
-���������� �����. ��. ":help credits" �
-.B Vim.
-.br
-.B Vim
-���������� �� ���� ��������� Stevie, ����������� ����� ��������� (Tim Thompson),
-���� �������� (Tony Andrews) � �. �. (������) �������� (G.R. (Fred) Walter). 
-������, � ��������� ����� � Vim ����� �� �������� ������ �� ������������� ���� 
-��� ���������������.
-.br
-������� ����������� 
-.B Vim 
-����������� � ������ ������� "�����", 
-��. <URL:http://sourceforge.net/projects/ruvim/>.
-.SH �����
-������ ����� ����.
-��. ":help todo" -- ������ ��������� �������.
-.PP
-�������, ��� ������ ����, ������� ��������� �������, �� ����� ����
-�������� ����������� ������� ������� ��������������� ��������� Vi.
-���� �� �������, ��� ���-�� �������� ������� ������ ������, ��� 
-"Vi ������ ��� ��-�������", ����������� ���������� ���� vi_diff.txt 
-(��� �������� ":help vi_diff.txt" � Vim) � ����������� ����� 'compatible'
-� 'cpoptions'.
diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man
deleted file mode 100644
index 5b9b83cb6c..0000000000
--- a/runtime/doc/vim.man
+++ /dev/null
@@ -1,428 +0,0 @@
-VIM(1)                                                                  VIM(1)
-
-
-
-NAME
-       vim - Vi IMproved, a programmers text editor
-
-SYNOPSIS
-       vim [options] [file ..]
-       vim [options] -
-       vim [options] -t tag
-       vim [options] -q [errorfile]
-
-       ex
-       view
-       gvim gview evim eview
-       rvim rview rgvim rgview
-
-DESCRIPTION
-       Vim  is a text editor that is upwards compatible to Vi.  It can be used
-       to edit all kinds of plain text.  It is especially useful  for  editing
-       programs.
-
-       There  are a lot of enhancements above Vi: multi level undo, multi win-
-       dows and buffers, syntax highlighting, command line  editing,  filename
-       completion,   on-line   help,   visual  selection,  etc..   See  ":help
-       vi_diff.txt" for a summary of the differences between Vim and Vi.
-
-       While running Vim a lot of help can be obtained from the  on-line  help
-       system,  with the ":help" command.  See the ON-LINE HELP section below.
-
-       Most often Vim is started to edit a single file with the command
-
-            vim file
-
-       More generally Vim is started with:
-
-            vim [options] [filelist]
-
-       If the filelist is missing, the editor will start with an empty buffer.
-       Otherwise  exactly  one out of the following four may be used to choose
-       one or more files to be edited.
-
-       file ..     A list of filenames.  The first one  will  be  the  current
-                   file  and  read  into the buffer.  The cursor will be posi-
-                   tioned on the first line of the buffer.  You can get to the
-                   other  files with the ":next" command.  To edit a file that
-                   starts with a dash, precede the filelist with "--".
-
-       -           The file to edit is read from  stdin.   Commands  are  read
-                   from stderr, which should be a tty.
-
-       -t {tag}    The file to edit and the initial cursor position depends on
-                   a "tag", a sort of goto label.  {tag} is looked up  in  the
-                   tags file, the associated file becomes the current file and
-                   the associated command is executed.  Mostly  this  is  used
-                   for  C  programs,  in  which case {tag} could be a function
-                   name.  The effect is that the file containing that function
-                   becomes  the  current  file and the cursor is positioned on
-                   the start of the function.  See ":help tag-commands".
-
-       -q [errorfile]
-                   Start in quickFix mode.  The file [errorfile] is  read  and
-                   the  first  error is displayed.  If [errorfile] is omitted,
-                   the  filename  is  obtained  from  the  'errorfile'  option
-                   (defaults  to  "AztecC.Err"  for the Amiga, "errors.err" on
-                   other systems).  Further errors can be jumped to  with  the
-                   ":cn" command.  See ":help quickfix".
-
-       Vim behaves differently, depending on the name of the command (the exe-
-       cutable may still be the same file).
-
-       vim       The "normal" way, everything is default.
-
-       ex        Start in Ex mode.  Go to Normal mode with the ":vi"  command.
-                 Can also be done with the "-e" argument.
-
-       view      Start  in read-only mode.  You will be protected from writing
-                 the files.  Can also be done with the "-R" argument.
-
-       gvim gview
-                 The GUI version.  Starts a new window.  Can also be done with
-                 the "-g" argument.
-
-       evim eview
-                 The GUI version in easy mode.  Starts a new window.  Can also
-                 be done with the "-y" argument.
-
-       rvim rview rgvim rgview
-                 Like the above, but with restrictions.  It will not be possi-
-                 ble  to  start  shell  commands, or suspend Vim.  Can also be
-                 done with the "-Z" argument.
-
-OPTIONS
-       The options may be given in  any  order,  before  or  after  filenames.
-       Options without an argument can be combined after a single dash.
-
-       +[num]      For  the  first  file the cursor will be positioned on line
-                   "num".  If "num" is missing, the cursor will be  positioned
-                   on the last line.
-
-       +/{pat}     For  the  first  file  the cursor will be positioned on the
-                   first occurrence of {pat}.  See ":help search-pattern"  for
-                   the available search patterns.
-
-       +{command}
-
-       -c {command}
-                   {command}  will  be  executed after the first file has been
-                   read.  {command} is interpreted as an Ex command.   If  the
-                   {command}  contains  spaces  it  must be enclosed in double
-                   quotes (this depends on the shell that is used).   Example:
-                   Vim "+set si" main.c
-                   Note: You can use up to 10 "+" or "-c" commands.
-
-       -S {file}   {file}  will be sourced after the first file has been read.
-                   This is equivalent to -c "source  {file}".   {file}  cannot
-                   start with '-'.  If {file} is omitted "Session.vim" is used
-                   (only works when -S is the last argument).
-
-       --cmd {command}
-                   Like using "-c", but the command is  executed  just  before
-                   processing  any  vimrc file.  You can use up to 10 of these
-                   commands, independently from "-c" commands.
-
-       -A          If Vim has been compiled with ARABIC  support  for  editing
-                   right-to-left  oriented  files and Arabic keyboard mapping,
-                   this option starts Vim in Arabic  mode,  i.e.  'arabic'  is
-                   set.  Otherwise an error message is given and Vim aborts.
-
-       -b          Binary  mode.  A few options will be set that makes it pos-
-                   sible to edit a binary or executable file.
-
-       -C          Compatible.  Set the 'compatible' option.  This  will  make
-                   Vim  behave  mostly  like  Vi,  even  though  a .vimrc file
-                   exists.
-
-       -d          Start in diff mode.  There should be  two,  three  or  four
-                   file  name arguments.  Vim will open all the files and show
-                   differences between them.  Works like vimdiff(1).
-
-       -d {device} Open {device} for use as a terminal.  Only  on  the  Amiga.
-                   Example: "-d con:20/30/600/150".
-
-       -D          Debugging.   Go  to debugging mode when executing the first
-                   command from a script.
-
-       -e          Start Vim in Ex mode, just like the executable  was  called
-                   "ex".
-
-       -E          Start Vim in improved Ex mode, just like the executable was
-                   called "exim".
-
-       -f          Foreground.  For the GUI version, Vim  will  not  fork  and
-                   detach from the shell it was started in.  On the Amiga, Vim
-                   is not restarted to open a new window.  This option  should
-                   be  used  when  Vim is executed by a program that will wait
-                   for the edit session to finish (e.g. mail).  On  the  Amiga
-                   the ":sh" and ":!" commands will not work.
-
-       --nofork    Foreground.   For  the  GUI  version, Vim will not fork and
-                   detach from the shell it was started in.
-
-       -F          If Vim has been compiled with  FKMAP  support  for  editing
-                   right-to-left  oriented  files  and Farsi keyboard mapping,
-                   this option starts Vim in  Farsi  mode,  i.e.  'fkmap'  and
-                   'rightleft'  are  set.  Otherwise an error message is given
-                   and Vim aborts.
-
-       -g          If Vim has been compiled  with  GUI  support,  this  option
-                   enables  the  GUI.   If  no GUI support was compiled in, an
-                   error message is given and Vim aborts.
-
-       -h          Give a bit of help about the  command  line  arguments  and
-                   options.  After this Vim exits.
-
-       -H          If Vim has been compiled with RIGHTLEFT support for editing
-                   right-to-left oriented files and Hebrew  keyboard  mapping,
-                   this  option  starts  Vim  in Hebrew mode, i.e. 'hkmap' and
-                   'rightleft' are set.  Otherwise an error message  is  given
-                   and Vim aborts.
-
-       -i {viminfo}
-                   When  using  the  viminfo file is enabled, this option sets
-                   the filename to use, instead of the  default  "~/.viminfo".
-                   This can also be used to skip the use of the .viminfo file,
-                   by giving the name "NONE".
-
-       -L          Same as -r.
-
-       -l          Lisp mode.  Sets the 'lisp' and 'showmatch' options on.
-
-       -m          Modifying files is disabled.  Resets  the  'write'  option.
-                   You  can still modify the buffer, but writing a file is not
-                   possible.
-
-       -M          Modifications not allowed.  The  'modifiable'  and  'write'
-                   options  will be unset, so that changes are not allowed and
-                   files can not be written.  Note that these options  can  be
-                   set to enable making modifications.
-
-       -N          No-compatible  mode.   Reset the 'compatible' option.  This
-                   will make Vim behave a bit better, but less Vi  compatible,
-                   even though a .vimrc file does not exist.
-
-       -n          No  swap file will be used.  Recovery after a crash will be
-                   impossible.  Handy if you want to edit a  file  on  a  very
-                   slow  medium  (e.g.  floppy).   Can also be done with ":set
-                   uc=0".  Can be undone with ":set uc=200".
-
-       -nb         Become an editor server for NetBeans.   See  the  docs  for
-                   details.
-
-       -o[N]       Open N windows stacked.  When N is omitted, open one window
-                   for each file.
-
-       -O[N]       Open N windows side by side.  When N is omitted,  open  one
-                   window for each file.
-
-       -p[N]       Open N tab pages.  When N is omitted, open one tab page for
-                   each file.
-
-       -R          Read-only mode.  The 'readonly' option will  be  set.   You
-                   can still edit the buffer, but will be prevented from acci-
-                   dently overwriting a file.  If you do want to  overwrite  a
-                   file,  add  an  exclamation  mark  to the Ex command, as in
-                   ":w!".  The -R option  also  implies  the  -n  option  (see
-                   below).   The  'readonly'  option  can  be reset with ":set
-                   noro".  See ":help 'readonly'".
-
-       -r          List swap files, with  information  about  using  them  for
-                   recovery.
-
-       -r {file}   Recovery  mode.  The swap file is used to recover a crashed
-                   editing session.  The swap file is a  file  with  the  same
-                   filename as the text file with ".swp" appended.  See ":help
-                   recovery".
-
-       -s          Silent mode.  Only when started as "Ex" or  when  the  "-e"
-                   option was given before the "-s" option.
-
-       -s {scriptin}
-                   The  script file {scriptin} is read.  The characters in the
-                   file are interpreted as if you had typed  them.   The  same
-                   can be done with the command ":source! {scriptin}".  If the
-                   end of the file is reached before the editor exits, further
-                   characters are read from the keyboard.
-
-       -T {terminal}
-                   Tells  Vim  the  name  of the terminal you are using.  Only
-                   required when the automatic way doesn't work.  Should be  a
-                   terminal  known  to Vim (builtin) or defined in the termcap
-                   or terminfo file.
-
-       -u {vimrc}  Use the commands in the file {vimrc}  for  initializations.
-                   All  the  other  initializations  are skipped.  Use this to
-                   edit a special kind of files.  It can also be used to  skip
-                   all  initializations by giving the name "NONE".  See ":help
-                   initialization" within vim for more details.
-
-       -U {gvimrc} Use the commands in the file {gvimrc} for  GUI  initializa-
-                   tions.   All the other GUI initializations are skipped.  It
-                   can also be used to skip all GUI initializations by  giving
-                   the  name "NONE".  See ":help gui-init" within vim for more
-                   details.
-
-       -V[N]       Verbose.  Give messages about which files are  sourced  and
-                   for  reading and writing a viminfo file.  The optional num-
-                   ber N is the value for 'verbose'.  Default is 10.
-
-       -v          Start Vim in Vi mode, just like the executable  was  called
-                   "vi".   This  only has effect when the executable is called
-                   "ex".
-
-       -w {scriptout}
-                   All the characters that you type are recorded in  the  file
-                   {scriptout},  until  you  exit  Vim.  This is useful if you
-                   want to create a script file to be used with  "vim  -s"  or
-                   ":source!".  If the {scriptout} file exists, characters are
-                   appended.
-
-       -W {scriptout}
-                   Like -w, but an existing file is overwritten.
-
-       -x          Use encryption when writing files.  Will prompt for a crypt
-                   key.
-
-       -X          Don't  connect to the X server.  Shortens startup time in a
-                   terminal, but the window title and clipboard  will  not  be
-                   used.
-
-       -y          Start Vim in easy mode, just like the executable was called
-                   "evim" or "eview".  Makes Vim behave like a  click-and-type
-                   editor.
-
-       -Z          Restricted  mode.   Works  like  the executable starts with
-                   "r".
-
-       --          Denotes the end of the options.  Arguments after this  will
-                   be  handled  as  a  file  name.  This can be used to edit a
-                   filename that starts with a '-'.
-
-       --echo-wid  GTK GUI only: Echo the Window ID on stdout.
-
-       --help      Give a help message and exit, just like "-h".
-
-       --literal   Take file name arguments literally,  do  not  expand  wild-
-                   cards.   This has no effect on Unix where the shell expands
-                   wildcards.
-
-       --noplugin  Skip loading plugins.  Implied by -u NONE.
-
-       --remote    Connect to a Vim server and make it edit the files given in
-                   the rest of the arguments.  If no server is found a warning
-                   is given and the files are edited in the current Vim.
-
-       --remote-expr {expr}
-                   Connect to a Vim server, evaluate {expr} in  it  and  print
-                   the result on stdout.
-
-       --remote-send {keys}
-                   Connect to a Vim server and send {keys} to it.
-
-       --remote-silent
-                   As  --remote,  but  without  the  warning when no server is
-                   found.
-
-       --remote-wait
-                   As --remote, but Vim does not exit  until  the  files  have
-                   been edited.
-
-       --remote-wait-silent
-                   As --remote-wait, but without the warning when no server is
-                   found.
-
-       --serverlist
-                   List the names of all Vim servers that can be found.
-
-       --servername {name}
-                   Use {name} as the server name.  Used for the  current  Vim,
-                   unless used with a --remote argument, then it's the name of
-                   the server to connect to.
-
-       --socketid {id}
-                   GTK GUI only: Use the GtkPlug  mechanism  to  run  gvim  in
-                   another window.
-
-       --version   Print version information and exit.
-
-ON-LINE HELP
-       Type  ":help"  in Vim to get started.  Type ":help subject" to get help
-       on a specific subject.  For example: ":help ZZ" to  get  help  for  the
-       "ZZ"  command.   Use <Tab> and CTRL-D to complete subjects (":help cmd-
-       line-completion").  Tags are present to jump from one place to  another
-       (sort of hypertext links, see ":help").  All documentation files can be
-       viewed in this way, for example ":help syntax.txt".
-
-FILES
-       /usr/local/lib/vim/doc/*.txt
-                      The Vim documentation files.  Use ":help  doc-file-list"
-                      to get the complete list.
-
-       /usr/local/lib/vim/doc/tags
-                      The  tags file used for finding information in the docu-
-                      mentation files.
-
-       /usr/local/lib/vim/syntax/syntax.vim
-                      System wide syntax initializations.
-
-       /usr/local/lib/vim/syntax/*.vim
-                      Syntax files for various languages.
-
-       /usr/local/lib/vim/vimrc
-                      System wide Vim initializations.
-
-       ~/.vimrc       Your personal Vim initializations.
-
-       /usr/local/lib/vim/gvimrc
-                      System wide gvim initializations.
-
-       ~/.gvimrc      Your personal gvim initializations.
-
-       /usr/local/lib/vim/optwin.vim
-                      Script used for the ":options" command, a  nice  way  to
-                      view and set options.
-
-       /usr/local/lib/vim/menu.vim
-                      System wide menu initializations for gvim.
-
-       /usr/local/lib/vim/bugreport.vim
-                      Script to generate a bug report.  See ":help bugs".
-
-       /usr/local/lib/vim/filetype.vim
-                      Script  to  detect  the type of a file by its name.  See
-                      ":help 'filetype'".
-
-       /usr/local/lib/vim/scripts.vim
-                      Script to detect the type of a  file  by  its  contents.
-                      See ":help 'filetype'".
-
-       /usr/local/lib/vim/print/*.ps
-                      Files used for PostScript printing.
-
-       For recent info read the VIM home page:
-       <URL:http://www.vim.org/>
-
-SEE ALSO
-       vimtutor(1)
-
-AUTHOR
-       Most of Vim was made by Bram Moolenaar, with a lot of help from others.
-       See ":help credits" in Vim.
-       Vim is based on Stevie, worked on by: Tim Thompson,  Tony  Andrews  and
-       G.R.  (Fred) Walter.  Although hardly any of the original code remains.
-
-BUGS
-       Probably.  See ":help todo" for a list of known problems.
-
-       Note that a number of things that may be regarded as bugs by some,  are
-       in  fact  caused by a too-faithful reproduction of Vi's behaviour.  And
-       if you think other things are bugs "because Vi  does  it  differently",
-       you  should  take  a closer look at the vi_diff.txt file (or type :help
-       vi_diff.txt when in Vim).  Also have a look  at  the  'compatible'  and
-       'cpoptions' options.
-
-
-
-                                  2006 Apr 11                           VIM(1)
diff --git a/runtime/doc/vim2html.pl b/runtime/doc/vim2html.pl
index 9066b03b16..9066b03b16 100644..100755
--- a/runtime/doc/vim2html.pl
+++ b/runtime/doc/vim2html.pl
diff --git a/runtime/doc/vimdiff-fr.1 b/runtime/doc/vimdiff-fr.1
deleted file mode 100644
index 67a64e381b..0000000000
--- a/runtime/doc/vimdiff-fr.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH VIMDIFF 1 "30 mars 2001"
-.SH NOM
-vimdiff \- ouvre deux, trois ou quatre versions d'un fichier dans Vim et
-affiche leurs diff�rences
-.SH SYNOPSIS
-.br
-.B vimdiff
-[options] fichier1 fichier2 [fichier3 [fichier4]]
-.PP
-.B gvimdiff
-.SH DESCRIPTION
-.B Vimdiff
-d�marre
-.B Vim
-avec deux (ou trois ou quatre) fichiers.
-Chaque fichier est ouvert dans sa propre fen�tre.
-Les diff�rences entre ces fichiers sont mises en surbrillance.
-C'est un outil tr�s pratique pour visualiser et reporter les
-changements entre deux versions d'un m�me fichier.
-.PP
-Consulter vim(1) pour des informations sur l'�diteur Vim lui-m�me.
-.PP
-Si
-.B gvimdiff
-est invoqu�, l'IHM graphique est d�marr�e quand elle est disponible.
-.PP
-L'option 'diff' est activ�e dans chacune des fen�tres, ce qui provoque la mise
-en surbrillance des diff�rences.
-.br
-Les options 'wrap' et 'scrollbind' sont activ�es pour donner un aspect
-agr�able au texte.
-.br
-L'option 'foldmethod' est fix�e � "diff", ce qui replie les lignes cons�cutives
-identiques. 'foldcolumn' est fix� � 2 pour trouver les replis rapidement et
-les ouvrir ou les fermer facilement.
-.SH ARGUMENTS
-La fen�tre de Vim est partag�e verticalement afin d'afficher les lignes
-correspondantes les unes en face des autres, comme si l'argument "\-O" �tait
-sp�cifi�. Utilisez l'argument "\-o" pour obtenir un partage horizontal � la
-place.
-.PP
-Pour conna�tre les autres arguments disponibles, consultez vim(1).
-.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 ":help credits" dans
-.B Vim.
-.SH TRADUCTION
-Cette page de manuel a �t� traduite par David Blanchet
-<david.blanchet@free.fr> 2005-03-12.
-Mise � jour 2012-05-06, Dominique Pell� <dominique.pelle@gmail.com>
diff --git a/runtime/doc/vimdiff-it.1 b/runtime/doc/vimdiff-it.1
deleted file mode 100755
index 2203877acf..0000000000
--- a/runtime/doc/vimdiff-it.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.TH VIMDIFF 1 "30 marzo 2001"
-.SH NOME
-vimdiff \- modifica due, tre o quattro versioni di un file con Vim,
-visualizzando le differenze
-.SH SINTASSI
-.br
-.B vimdiff
-[opzioni] file1 file2 [file3 [file4]]
-.PP
-.B gvimdiff
-.SH DESCRIZIONE
-.B Vimdiff
-inizia
-.B Vim
-per due (o tre o quattro) file.
-Ogni file ha una sua finestra.
-Le differenze fra file sono evidenziate.
-� una maniera elegante per controllare modifiche e portare modifiche
-verso un'altra versione dello stesso file.
-.PP
-Vedere vim(1) per dettagli su Vim in generale.
-.PP
-Se iniziato con
-.B gvimdiff
-la GUI sar� utilizzata, se disponibile.
-.PP
-In ogni finestra l'opzione 'diff' � impostata, evidenziando cos� le
-differenze.
-.br
-Le opzioni 'wrap' e 'scrollbind' sono impostate per migliorare la
-visibilit� del testo.
-.br
-L'opzione 'foldmethod' � impostata al valore "diff", che mette gruppi di
-linee uguali fra i diversi file in una piegatura. 'foldcolumn' � impostato
-a due per poter facilmente visualizzare le piegature, aprirle e chiuderle.
-.SH OPZIONI
-Lo schermo � diviso verticalmente, come se aveste usato l'opzione "\-O".
-Per dividerlo orizzontalmente, usare l'opzione "\-o".
-.PP
-Per tutte le altre opzioni, vedere vim(1).
-.SH VEDERE ANCHE
-vim(1)
-.SH AUTORE
-Buona parte di
-.B Vim
-� stato scritto da Bram Moolenaar, con molto aiuto da altri.
-Vedere ":help credits" in
-.B Vim.
diff --git a/runtime/doc/vimdiff-pl.1 b/runtime/doc/vimdiff-pl.1
deleted file mode 100644
index 5332f78328..0000000000
--- a/runtime/doc/vimdiff-pl.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH VIMDIFF 1 "2001 Mar 30"
-.SH NAZWA
-vimdiff \- edytuj dwie, trzy lub cztery wersje pliku w Vimie i zobacz r�nice
-.SH SYNOPSIS
-.br
-.B vimdiff
-[opcje] plik1 plik2 [plik3 [plik4]]
-.PP
-.B gvimdiff
-.SH OPIS
-.B Vimdiff
-uruchomi
-.B Vima
-z dwoma (trzema lub czterema plikami), ka�dy z nich we w�asnym oknie.
-R�nice mi�dzy plikami zostan� pod�wietlone.
-Jest to dobry spos�b by przeanalizowa� r�nice i przenie�� zmiany z jednej
-wersji pliku do innej.
-.PP
-Zobacz vim(1) by pozna� wi�cej szczeg��w o samym Vimie.
-.PP
-Kiedy uruchomiony jako
-.B gvimdiff
-zostanie uruchomione GUI (je�li dost�pne).
-.PP
-W ka�dym oknie zostanie ustawiona opcja 'diff', kt�ra spowoduje
-pod�wietlenie r�nic.
-.br
-Opcje 'wrap' i 'scrollbind' zostan� ustawione by tekst si�
-wygodnie przegl�da�o.
-.br
-Opcja 'foldmethod' zostanie ustawiona na "diff", dzi�ki czemu
-niezmienione linie zostan� zwini�te. 'foldcolumn' b�dzie r�wne 2 aby
-�atwo wyszukiwa�, otwiera� i zamyka� zwini�cia.
-.SH OPCJE
-Pionowy podzia� zostanie u�yty do wyr�wnania linii, tak jakby u�yto
-opcji "\-O". Aby uzyska� poziomy podzia� u�yj opcji "\-o".
-.PP
-Aby pozna� inne opcje zobacz vim(1).
-.SH ZOBACZ TAK�E
-vim(1)
-.SH AUTOR
-Wi�kszo��
-.B Vima
-zosta�a napisana przez Brama Moolenaara przy pomocy wielu innych os�b.
-Zobacz ":help credits w
-.B Vimie.
diff --git a/runtime/doc/vimdiff-ru.1 b/runtime/doc/vimdiff-ru.1
deleted file mode 100644
index 385536790e..0000000000
--- a/runtime/doc/vimdiff-ru.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.TH VIMDIFF 1 "2001 March 30"
-.SH ���
-vimdiff \- ��������� ������������� ��� ��� ��� ������ ����� � ������� Vim 
-� ������������ ��������.
-.SH ��������� ������
-.br
-.B vimdiff
-[�����] ����1 ����2 [����3]
-.PP
-.B gvimdiff
-.SH ��������
-�������
-.B vimdiff
-��������� �
-.B Vim
-��� (��� ���) �����. ������ ���� ����������� � ����������� ����.
-�������� ����� ������� ������������ � ������� ��������� ����������.
-��� ������� ��������� �������� ���������� ���ӣ���� ��������� � ����������
-������������� ��������� �� ����� ������ ����� � ������.
-.PP
-��������� � Vim ��. �� �������� ����������� vim(1).
-.PP
-��� ������� � ������� �������
-.B gvimdiff 
-�������� ����������� � ������ ������������ ����������, ���� ��� ��������.
-.PP
-� ������ ���� ���������� ����� 'diff', ��� ��������� ������������ ��������� 
-���������� ��� ����������� �������� ����� �������.
-.br
-��� ��������� ������ � ������� � ������ ����������� ������� ����� ����������
-����� 'wrap' � 'scrollbind'.
-.br
-�������� ����� 'foldmethod' ��������������� ������ "diff", ��� ���������
-������� � ������� ������� ������, ������� �� ���������� � ��������� ������� �����.
-�������� ����� 'foldcolumn' ��������������� ������ 2, ����� ���� ����� 
-��������, ��������� � ��������� ����� �������.
-.SH ����� �������
-��� ������������ ����� ����� ������ ������������ ������������ ���������� ����,
-��� ���� �� ������������� ���� "\-O". ��� ����, ����� ������������ ����������
-���� �� �����������, ������� ������� � ��������� ������ ���� "\-o".
-.PP
-��������� ����� ��������� ������ ��������������� �� �������� ����������� vim(1).
-.SH ������ �����
-vim(1)
-.SH ������
-������� �����
-.B Vim
-������� ������ ����������� (Bram Moolenaar), �������� �������� �������� 
-���������� �����. ��. ":help credits" �
-.B Vim.
diff --git a/runtime/doc/vimdiff.man b/runtime/doc/vimdiff.man
deleted file mode 100644
index 913ac13847..0000000000
--- a/runtime/doc/vimdiff.man
+++ /dev/null
@@ -1,46 +0,0 @@
-VIMDIFF(1)                                                          VIMDIFF(1)
-
-
-
-NAME
-       vimdiff  - edit two, three or four versions of a file with Vim and show
-       differences
-
-SYNOPSIS
-       vimdiff [options] file1 file2 [file3 [file4]]
-
-       gvimdiff
-
-DESCRIPTION
-       Vimdiff starts Vim on two (or three or four) files.  Each file gets its
-       own  window.   The differences between the files are highlighted.  This
-       is a nice way to inspect changes and to move changes from  one  version
-       to another version of the same file.
-
-       See vim(1) for details about Vim itself.
-
-       When started as gvimdiff the GUI will be started, if available.
-
-       In  each window the 'diff' option will be set, which causes the differ-
-       ences to be highlighted.
-       The 'wrap' and 'scrollbind' options are set to make the text look good.
-       The  'foldmethod'  option  is set to "diff", which puts ranges of lines
-       without changes in a fold.  'foldcolumn' is set to two to make it  easy
-       to spot the folds and open or close them.
-
-OPTIONS
-       Vertical  splits  are  used to align the lines, as if the "-O" argument
-       was used.  To use horizontal splits instead, use the "-o" argument.
-
-       For all other arguments see vim(1).
-
-SEE ALSO
-       vim(1)
-
-AUTHOR
-       Most of Vim was made by Bram Moolenaar, with a lot of help from others.
-       See ":help credits" in Vim.
-
-
-
-                                 2001 March 30                      VIMDIFF(1)
diff --git a/runtime/doc/vimtutor-fr.1 b/runtime/doc/vimtutor-fr.1
deleted file mode 100644
index 06e03fbef3..0000000000
--- a/runtime/doc/vimtutor-fr.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.TH VIMTUTOR 1 "2 avril 2001"
-.SH NAME
-vimtutor \- tutoriel Vim
-.SH SYNOPSIS
-.br
-.B vimtutor [\-g] [langue]
-.SH DESCRIPTION
-.B Vimtutor
-lance le tutoriel
-.B Vim
-\.
-Il copie d'abord le fichier du tutoriel, afin que vous puissiez le modifier
-sans alt�rer le fichier original.
-.PP
-.B Vimtutor
-est utile pour les personnes souhaitant apprendre leurs premi�res commandes
-.B Vim
-\.
-.PP
-L'argument optionnel \-g lance vimtutor avec gvim plut�t qu'avec vim, si l'IHM
-graphique de vim est disponible, ou le lance avec vim si gvim n'est pas
-disponible.
-.PP
-L'argument optionnel [langue] est le nom d'une langue, sp�cifi�e par son
-symbole � deux lettres, tels que "it" ou "es". Si l'argument [langue] est omis,
-la langue de la r�gion linguistique actuelle sera retenue. Si le tutoriel est
-disponible dans cette langue, il est propos�. Sinon, c'est la version anglaise
-qui est propos�e.
-.PP
-.B Vim
-est toujours lanc� en mode Compatible Vi.
-.SH FICHIERS
-.TP 15
-/usr/local/lib/vim/tutor/tutor[.langue]
-Les fichiers textes de
-.B Vimtutor
-\.
-.TP 15
-/usr/local/lib/vim/tutor/tutor.vim
-Le script Vim utilis� pour copier les fichiers texte de
-.B Vimtutor
-\.
-.SH AUTEUR
-.B Vimtutor
-a �t� �crit � l'origine pour Vi par Michael C. Pierce et Robert K. Ware, de la
-Colorado School of Mines, en reprenant des id�es �mises par Charles Smith, de
-la Colorado State University.
-E-mail : bware@mines.colorado.edu.
-.br
-Il a �t� modifi� pour
-.B Vim
-par Bram Moolenaar.
-Pour conna�tre le nom des traducteurs, consultez les fichiers textes du
-tutoriel.
-.SH VOIR AUSSI
-vim(1)
-.SH TRADUCTION
-Cette page de manuel a �t� traduite par David Blanchet
-<david.blanchet@free.fr> 2004-12-27.
-Mise � jour 2012-05-06, Dominique Pell� <dominique.pelle@gmail.com>
diff --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/vimtutor-it.1
deleted file mode 100755
index b5c1e61e01..0000000000
--- a/runtime/doc/vimtutor-it.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH VIMTUTOR 1 "2 aprile 2001"
-.SH NOME
-vimtutor \- Un breve corso per imparare Vim
-.SH SINTASSI
-.br
-.B vimtutor [\-g] [lingua]
-.SH DESCRIZIONE
-.B Vimtutor
-inizia il
-.B Vim
-tutor (una breve corso per imparare Vim).
-Per prima cosa viene creata una copia del file di lavoro, che pu� cos� essere
-modificato senza alterare il file usato come modello.
-.PP
-Il comando
-.B Vimtutor
-� utile a chi voglia imparare i primi comandi
-.B Vim
-.
-.PP
-L'argomento opzionale \-g inizia vimtutor usando gvim invece che vim, se la
-versione GUI di vim � disponibile. oppure utilizza vim, se gvim non �
-disponibile.
-.PP
-L'arogmento opzionale [lingua] � l'abbreviazione di due lettere del nome
-di una lingua, per esempio "it" oppure "es".
-se L'argomento [lingua] non viene specificato, si utilizza la lingua "locale"
-del computer.
-Se la versione in quella lingua del "tutor" � disponibile, sar� usata.
-Altrimenti sar� usata la versione inglese.
-.PP
-.B Vim
-� sempre iniziato in Modo compatibile con vi.
-.SH FILE
-.TP 15
-/usr/local/lib/vim/tutor/tutor[.language]
-Il/I file di testo per
-.B Vimtutor
-
-.TP 15
-/usr/local/lib/vim/tutor/tutor.vim
-Lo script di Vim usato per copiare il file di testo
-.B Vimtutor
-.
-.SH AUTORE
-The
-.B Vimtutor
-� stato scritto in origine per Vi da Michael C. Pierce e Robert K. Ware,
-Colorado School of Mines, usando idee fornite da Charles Smith,
-Colorado State University.
-E\-mail: bware@mines.colorado.edu.
-.br
-� stato modificato per
-.B Vim
-da Bram Moolenaar.
-Per i nomi dei traduttori, vedere i file usati nelle rispettive lingue.
-.SH VEDERE ANCHE
-vim(1)
diff --git a/runtime/doc/vimtutor-pl.1 b/runtime/doc/vimtutor-pl.1
deleted file mode 100644
index e603ca5b8f..0000000000
--- a/runtime/doc/vimtutor-pl.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH VIMTUTOR 1 "2001 Kwi 2"
-.SH NAZWA
-vimtutor \- nauczyciel Vima
-.SH SYNOPSIS
-.br
-.B vimtutor -g [j�zyk]
-.SH OPIS
-.B Vimtutor
-uruchamia nauczyciela
-.B Vima.
-Najpierw kopiuje w�a�ciwy plik, dzi�ki temu mo�na go zmienia� bez obaw
-utraty tre�ci.
-.PP
-.B Vimtutor
-przyda si� ludziom, kt�rzy chc� si� nauczy� pierwszych polece�
-.B Vima
-.PP
-Opcjonalny argument \-g uruchamia vimtutor w gvimie a nie w Vimie je�li
-graficzna wersja Vima jest dost�pna, je�li nie zostanie uruchomiony Vim.
-.PP
-Opcjonalny argument [j�zyk] jest dwu literowym kodem j�zyka, tak jak
-"it" lub "es".
-Je�li brak argumentu [j�zyk] zostanie u�yty j�zyk bie��cej
-lokalizacji.
-Je�li nauczyciel w tym j�zyku jest dost�pny, zostanie u�yty \- w innym
-wypadku zostanie wykorzystana wersja angielska.
-.PP
-.B Vim
-jest uruchamiany zawsze w trybie kompatybilno�ci z Vi
-.SH PLIKI
-.TP 15
-/usr/local/lib/vim/tutor/tutor[.j�zyk]
-Tekstowe pliki
-.B Vimtutora.
-.TP 15
-/usr/local/lib/vim/tutor/tutor.vim
-Skrypt Vima u�ywany do kopiowania pliku
-.B Vimtutora.
-.SH AUTOR
-.B Vimtutor
-zosta� pocz�tkowo napisany dla Vi przez Michaela C. Pierce'a
-i Roberta K. Ware'a z Colorado School of Mines zainspirowani przez
-Charlesa Smitha z Colorado State University.
-E-mail: bware@mines.colorado.edu
-.br
-Zmodyfikowany na potrzeby
-.B Vima
-przez Brama Moolenaara.
-Nazwiska t�umaczy w plikach.
-.SH ZOBACZ TAK�E
-vim(1)
diff --git a/runtime/doc/vimtutor-ru.1 b/runtime/doc/vimtutor-ru.1
deleted file mode 100644
index fa3c5d9b08..0000000000
--- a/runtime/doc/vimtutor-ru.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH VIMTUTOR 1 "2001 April 2"
-.SH ���
-vimtutor \- ������� �� Vim
-.SH ��������� ������
-.br
-.B vimtutor [����]
-.SH ��������
-�������
-.B vimtutor
-��������� ������� ��
-.B Vim.
-��� ���� ������� ���������� �������� ����� ����� ��������, 
-����� ��� ����� ���� ������������� ��� �������� �������� �������� ����.
-.PP
-���������
-.B vimtutor
-������� ��� ��������, �������� ��������� ����� �������� ��������
-.B Vim.
-.PP
-�������������� �������� [����] ������������ ����� �������������� ��� �����,
-�������� "ru" ��� "it".
-���� �������� [����] �� ������, �� ������������ ���� �������� � ��������� 
-������ ������. ���� ������� �� ���� ����� �� ����������, �� �� ��������� 
-������������ ������� �� ���������� �����.
-.PP
-��� ������ � ���������
-.B Vim
-������ ����������� � ������ ������������� � Vi.
-.SH �����
-.TP 15
-/usr/local/lib/vim/tutor/tutor[.����]
-����� ��������
-.B vimtutor.
-.TP 15
-/usr/local/lib/vim/tutor/tutor.vim
-�������� Vim, ������� ������������ ��� �������� �������
-����� ������ ��������
-.B vimtutor.
-.SH ������
-.B Vimtutor
-��� ������� ������� ��� Vi ������� �. ������ (Michael C. Pierce) �
-�������� �. ��� (Robert K. Ware) �� Colorado School of Mines ��
-���� ������� ����� (Charles Smith) �� Colorado State University.
-E-mail: bware@mines.colorado.edu.
-.br
-������������ ������� ��� ��������� ��� ������������� � 
-.B Vim
-������ ����������� (Bram Moolenaar).
-����� ������������ �������� ����������� � ��������������� ������.
-.SH ������ �����
-vim(1)
diff --git a/runtime/doc/vimtutor.man b/runtime/doc/vimtutor.man
deleted file mode 100644
index 9f2350a0ae..0000000000
--- a/runtime/doc/vimtutor.man
+++ /dev/null
@@ -1,50 +0,0 @@
-VIMTUTOR(1)                                                        VIMTUTOR(1)
-
-
-
-NAME
-       vimtutor - the Vim tutor
-
-SYNOPSIS
-       vimtutor [-g] [language]
-
-DESCRIPTION
-       Vimtutor starts the Vim tutor.  It copies the tutor file first, so that
-       it can be modified without changing the original file.
-
-       The Vimtutor is useful for people that want to learn  their  first  Vim
-       commands.
-
-       The  optional argument -g starts vimtutor with gvim rather than vim, if
-       the GUI version of vim is available, or falls back to Vim  if  gvim  is
-       not found.
-
-       The  optional [language] argument is the two-letter name of a language,
-       like "it" or "es".  If the [language] argument is missing, the language
-       of  the  current  locale  will be used.  If a tutor in this language is
-       available, it will be used.  Otherwise  the  English  version  will  be
-       used.
-
-       Vim is always started in Vi compatible mode.
-
-FILES
-       /usr/local/lib/vim/tutor/tutor[.language]
-                      The Vimtutor text file(s).
-
-       /usr/local/lib/vim/tutor/tutor.vim
-                      The Vim script used to copy the Vimtutor text file.
-
-AUTHOR
-       The  Vimtutor  was  originally  written for Vi by Michael C. Pierce and
-       Robert K. Ware, Colorado  School  of  Mines  using  ideas  supplied  by
-       Charles  Smith,  Colorado  State  University.  E-mail: bware@mines.col‐
-       orado.edu.
-       It was modified for Vim by Bram Moolenaar.  For the names of the trans‐
-       lators see the tutor files.
-
-SEE ALSO
-       vim(1)
-
-
-
-                                 2001 April 2                      VIMTUTOR(1)
diff --git a/runtime/doc/xxd-fr.1 b/runtime/doc/xxd-fr.1
deleted file mode 100644
index be780858bf..0000000000
--- a/runtime/doc/xxd-fr.1
+++ /dev/null
@@ -1,396 +0,0 @@
-.TH XXD 1 "ao�t 1996" "Page de manuel pour xxd"
-.\"
-.\" 21st May 1996
-.\" Man page author:
-.\"    Tony Nugent <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.\"    Changes by Bram Moolenaar <Bram@vim.org>
-.\"    French translation by David Blanchet <david.blanchet@free.fr> 2005-03
-.SH NOM
-.I xxd
-\- convertit en repr�sentation hexad�cimale et inversement.
-.SH SYNOPSIS
-.B xxd
-\-h[elp]
-.br
-.B xxd
-[options] [fichier_entree [fichier_sortie]]
-.br
-.B xxd
-\-r[evert] [options] [fichier_entree [fichier_sortie]]
-.SH DESCRIPTION
-.I xxd
-cr�e un fichier contenant la repr�sentation hexad�cimale d'un fichier
-binaire ou de l'entr�e standard.
-Il peut �galement convertir un fichier de codes hexad�cimaux en un fichier
-binaire.
-Comme
-.BR uuencode (1)
-et
-.BR uudecode (1)
-il permet la transmission de donn�es binaires dans une repr�sentation ASCII
-compatible avec le courrier �lectronique, mais a l'avantage de d�coder la
-sortie standard.
-De plus, il peut �tre utilis� pour appliquer des rustines � des fichiers
-binaires.
-.SH OPTIONS
-Si aucun
-.I fichier_entree
-n'est sp�cifi�, l'entr�e standard est utilis�e.
-Si
-.I fichier_entree
-correspond au caract�re
-.RB '\-'
-\, l'entr�e standard est employ�e comme source des donn�es en entr�e.
-Si aucun
-.I fichier_sortie
-n'est sp�cifi� (ou qu'un caract�re
-.RB '\-'
-est donn� � sa place), le r�sultat est envoy� sur la sortie standard.
-.PP
-NOTE : un analyseur paresseux est utilis�. Il ne v�rifie pas au-del� de la
-premi�re lettre de l'option, � moins que cette derni�re ne requiert un
-param�tre.
-L'espace entre l'option et son param�tre est optionnel.
-Les param�tres des options peuvent �tre sp�cifi�s en notation d�cimale,
-hexad�cimale ou octale.
-Ainsi
-.BR \-c8 ,
-.BR "\-c 8" ,
-.B \-c 010
-et
-.B \-cols 8
-sont tous �quivalents.
-.TP
-.IR \-a " | " \-autoskip
-active la fonctionnalit� "autoskip" : le caract�re '*' remplace les lignes
-d'octets nuls. D�sactiv�e par d�faut.
-.TP
-.IR \-b " | " \-bits
-Convertit en binaires plut�t qu'en hexad�cimal.
-Cette option �crit les octets comme une s�quence de "1" et de "0" au lieu
-d'une conversion en hexad�cimal traditionnel. Chaque ligne est pr�c�d�e par un
-num�ro de ligne en hexad�cimal et suivie de la repr�sentation ASCII (ou
-EBCDIC) correspondante. Les options \-r, \-p, \-i ne fonctionnent pas dans ce
-mode.
-.TP
-.IR "\-c cols " | " \-cols cols"
-place
-.RI < cols >
-octets par ligne. 16 par d�faut (\-i : 12, \-ps : 30, \-b : 6). Maximum 256.
-.TP
-.IR \-E " | " \-EBCDIC
-Passe le codage des caract�res de la colonne de droite de ASCII � EBCDIC.
-Cela ne change pas la repr�sentation hexad�cimale. Cette option est sans effet
-quand elle est utilis�e avec \-r, \-p or \-i.
-.TP
-.IR "\-g octets " | " \-groupsize octets"
-Regroupe les octets (deux chiffres hexad�cimaux ou huit chiffres binaires)
-par groupe de
-.RI < octets >
-\, s�par�s par des espaces blancs. Sp�cifiez
-.I \-g 0
-pour supprimer le regroupement.
-.RI < octets >
-vaut 2 par d�faut dans le mode normal et \fI1\fP en
-repr�sentation binaire. Le regroupement ne s'applique pas aux styles
-Postscript et Include.
-.TP
-.IR \-h " | " \-help
-Affiche un r�sum� des commandes disponibles et quitte. Aucune conversion n'est
-effectu�e.
-.TP
-.IR \-i " | " \-include
-produit une sortie dans le style #include (fichier C � inclure). La d�finition
-compl�te d'un tableau statique est �crite et est nomm�e d'apr�s le fichier
-d'origine, � moins que xxd lise depuis l'entr�e standard.
-.TP
-.IR "\-l long " | " \-len long"
-Arr�te apr�s l'�criture de
-.RI  < long >
-octets.
-.TP
-.IR \-p " | " \-ps " | " \-postscript " | " \-plain
-Produit une conversion continue dans le style Postscript (postscript continuous
-hexdumd style).
-�galement connu sous le nom de � conversion brute � (plain hexdump style).
-.TP
-.IR \-r " | " \-revert
-Op�ration inverse : convertit un fichier hexad�cimal en un fichier binaire (ou
-applique une rustine � un fichier binaire).
-Si l'�criture n'a pas lieu sur la sortie standard, xxd �crit dans le fichier
-qu'il produit sans le tronquer. Utilisez la combinaison
-.I \-r \-p
-pour lire de l'hexad�cimal brut sans information sur le num�ro des lignes et
-sans format de colonnes particulier. Des espaces blancs et coupures de lignes
-suppl�mentaires sont autoris�s � n'importe quel endroit.
-.TP
-.I \-seek d�calage
-Utilis� apr�s l'option
-.IR \-r :
-inverse la conversion en ajoutant
-.RI < d�calage >
-aux positions dans le fichier donn�es dans le code hexad�cimal.
-.TP
-.I \-s [+][\-]d�calage
-D�bute au
-.RI < d�calage >
-absolu ou relatif dans fichier_entree.
-\fI+ \fRindique que le d�calage est relatif � la position courante dans
-l'entr�e standard (sans effet si la lecture n'a pas lieu sur l'entr�e
-standard). \fI\- \fRindique un d�calage en caract�res depuis la fin de
-l'entr�e (utilis� avec \fI+\fR, d�signe la position avant la position
-actuelle de l'entr�e standard).
-Sans l'option \-s, xxd d�marre � la position courante du fichier.
-.TP
-.I \-u
-Utilise des chiffres hexad�cimaux majuscules. La casse par d�faut est
-minuscule.
-.TP
-.IR \-v " | " \-version
-Affiche la version de xxd.
-.SH MISE EN GARDE
-.I xxd \-r
-effectue des op�rations internes un peu obscures lors de l'�valuation
-des informations sur les num�ros de lignes. Si le fichier de sortie est
-adressable, alors les num�ros de lignes au d�but de chaque ligne d'hexad�cimal
-peuvent �tre d�sordonn�es, des lignes peuvent manquer ou se chevaucher. Dans
-ces cas, xxd utilisera lseek(2) pour d�terminer la prochaine position. Si le
-fichier n'est pas adressable, seuls les vides sont autoris�s, et ils seront
-combl�s par des octets nuls.
-.PP
-.I xxd \-r
-ne g�n�re aucune erreur lors de l'analyse. Les probl�mes sont pass�s
-silencieusement.
-.PP
-Lors de l'�dition de la repr�sentation hexad�cimale, veuillez noter que
-.I xxd \-r
-ignore tout ce qui se trouve sur la ligne apr�s avoir lu suffisamment de
-donn�es hexad�cimales (voir l'option \-c). Cela signifie �galement que les
-modifications dans la colonne ASCII (ou EBCDIC) sont toujours ignor�es. La
-conversion inverse de donn�es hexad�cimales brutes (postscript) avec xxd \-r
-\-p ne d�pend pas d'un nombre correct de colonnes. Dans ce cas, tout ce qui
-ressemble � une paire de chiffres hexad�cimaux est interpr�t�.
-.PP
-Remarquez la diff�rence entre
-.br
-\fI% xxd \-i fichier\fR
-.br
-et
-.br
-\fI% xxd \-i < fichier\fR
-.PP
-.I xxd \-s \+seek
-peut diff�rer de
-.IR "xxd \-s seek" ,
-car lseek(2) est utilis� pour � revenir en arri�re �. Le '+' fait une
-diff�rence quand la source des donn�es est l'entr�e standard et si la position
-dans le fichier de l'entr�e standard n'est pas au d�but du fichier lorsque xxd
-est d�marr� et qu'il re�oit ses donn�es.
-L'exemple suivant peut vous aider � comprendre (ou bien vous perdre davantage
-encore !)...
-.PP
-Remettre l'entr�e standard au d�part avant de lire ; n�cessaire car 'cat' a
-d�j� lu jusqu'� la fin de l'entr�e standard.
-.br
-\fI% sh \-c 'cat > donnees_binaires; xxd \-s 0 > donnees_hexa' < fichier\fR
-.PP
-Convertir � partir de la position 0x480 (= 1024 + 128) du fichier.
-Le symbole '+' signifie "relativement � la position actuelle', ainsi 128 est
-ajout� aux 1024 octets comptabilis�s pour dd.
-.br
-\fI% sh \-c 'dd of=donnees_binaires bs=1k count=1; xxd \-s +128 >
-donnees_hexa' < fichier\fR
-.PP
-Convertir de fichier depuis la position 0x100 (= 1024 \- 768) du fichier.
-.br
-\fI% sh \-c 'dd of=donnees_binaires bs=1k count=1; xxd \-s +\-768 >
-donnees_hexa' < fichier\fR
-.PP
-Toutefois, cette situation est peu fr�quente et l'utilisation de '+' est
-rarement requise. L'auteur pr�f�re surveiller les effets de xxd avec strace(1)
-ou truss(1) quand \-s est employ�.
-.SH EXEMPLES
-Afficher la totalit� du
-.B fichier
-sauf les trois premi�res lignes (0x30 octets en hexad�cimal).
-.br
-\fI% xxd \-s 0x30 fichier\fR
-.PP
-afficher les trois derni�res lignes (0x30 octets en hexad�cimal) du
-.B fichier
-\.
-.br
-\fI% xxd \-s \-0x30 fichier\fR
-.PP
-.br
-Afficher 120 octets convertis en continu, avec 20 octets par ligne.
-.br
-\fI% xxd \-l 120 \-ps \-c 20 xxd\-fr.1\fR
-.br
-2e54482058584420312022616ffb742031393936
-.br
-22202250616765206465206d616e75656c20706f
-.br
-757220787864220a2e5c220a2e5c222032317374
-.br
-204d617920313939360a2e5c22204d616e207061
-.br
-676520617574686f723a0a2e5c2220202020546f
-.br
-6e79204e7567656e74203c746f6e79407363746e
-.br
-204e7567656e74203c746f6e79407363746e7567
-.br
-2e54482058584420312022417567757374203139
-.PP
-Convertir les 120 premiers octets de cette page de manuel avec 12 octets par
-ligne.
-.br
-\fI% xxd \-l 120 \-c 12 xxd\-fr.1\fR
-.br
-0000000: 2e54 4820 5858 4420 3120 2261  .TH XXD 1 "a
-.br
-000000c: 6ffb 7420 3139 3936 2220 2250  o.t 1996" "P
-.br
-0000018: 6167 6520 6465 206d 616e 7565  age de manue
-.br
-0000024: 6c20 706f 7572 2078 7864 220a  l pour xxd".
-.br
-0000030: 2e5c 220a 2e5c 2220 3231 7374  .\"..\" 21st
-.br
-000003c: 204d 6179 2031 3939 360a 2e5c   May 1996..\
-.br
-0000048: 2220 4d61 6e20 7061 6765 2061  " Man page a
-.br
-0000054: 7574 686f 723a 0a2e 5c22 2020  uthor:..\"
-.br
-0000060: 2020 546f 6e79 204e 7567 656e    Tony Nugen
-.br
-000006c: 7420 3c74 6f6e 7940 7363 746e  t <tony@sctn
-.PP
-Afficher la date �crite au d�but du fichier xxd\-fr.1.
-.br
-\fI% xxd \-s 0x38 \-l 13 \-c 13 xxd.1\fR
-.br
-0000036: 3231 7374 204d 6179 2031 3939 36  21st May 1996
-.PP
-Copier
-.B fichier_entree
-vers
-.B fichier_sortie
-en ajoutant 100 octets de valeur 0x00 avant.
-.br
-\fI% xxd fichier_entree | xxd \-r \-s 100 \> fichier_sortie\fR
-.PP
-Patcher la date dans le fichier xxd.1
-.br
-\fI% echo '0000037: 3574 68' | xxd \-r \- xxd\-fr.1\fR
-.br
-\fI% xxd \-s 0x38 \-l 13 \-c 13 xxd\-fr.1\fR
-.br
-0000036: 3235 7468 204d 6179 2031 3939 36  25th May 1996
-.PP
-Cr�er un fichier de 65537 octets tous nuls (0x00),
-sauf le dernier qui vaut 'A' (0x41 en hexad�cimal).
-.br
-\fI% echo '010000: 41' | xxd \-r \> fichier\fR
-.PP
-.br
-Convertir le fichier de l'exemple pr�c�dent avec la fonctionnalit� "autoskip".
-.br
-\fI% xxd \-a \-c 12 fichier\fR
-.br
-0000000: 0000 0000 0000 0000 0000 0000  ............
-.br
-*
-.br
-000fffc: 0000 0000 40                   ....A
-.PP
-Cr�er un fichier d'un octet, contenant seulement le caract�re 'A'.
-Le nombre apr�s '\-r \-s' s'ajoute aux num�ros de lignes trouv�es dans le
-fichier ; les octets initiaux sont supprim�s.
-.br
-\fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> fichier\fR
-.PP
-Utiliser xxd comme filtre dans un �diteur tel que
-.B vim(1)
-pour convertir une zone comprise entre les marques 'a' et 'z'.
-.br
-\fI:'a,'z!xxd\fR
-.PP
-Utiliser xxd comme filtre dans un �diteur tel que
-.B vim(1)
-pour r�cup�rer une conversion binaire comprise entre les marques 'a' et 'z'.
-.br
-\fI:'a,'z!xxd \-r\fR
-.PP
-Utiliser xxd comme filtre dans un �diteur tel que
-.B vim(1)
-pour r�cup�rer une ligne convertie. Placez le curseur sur la ligne et tapez :
-.br
-\fI!!xxd \-r\fR
-.PP
-Lire des caract�res depuis une connexion s�rie :
-.br
-\fI% xxd \-c1 < /dev/term/b &\fR
-.br
-\fI% stty < /dev/term/b \-echo \-opost \-isig \-icanon min 1\fR
-.br
-\fI% echo \-n foo > /dev/term/b\fR
-.SH VALEURS DE RETOUR
-Les erreurs suivantes sont rapport�es :
-.TP
-0
-aucune erreur ne s'est produit.
-.TP
-\-1
-op�ration non support�e (
-.I xxd \-r \-i
-reste impossible).
-.TP
-1
-erreur lors de l'analyse des options.
-.TP
-2
-probl�me avec le fichier d'entr�e.
-.TP
-3
-probl�me avec le fichier de sortie.
-.TP
-4, 5
-la position sp�cifi�e n'est pas atteignable.
-.SH VOIR AUSSI
-uuencode(1), uudecode(1), patch(1)
-.SH AVERTISSEMENTS
-L'�tranget� de cet outil refl�te celle du cerveau de ses cr�ateurs.
-Utilisez cet outil � vos risques et p�rils. Dupliquez vos fichiers.
-Surveillez l'outil. Devenez un gourou.
-.SH VERSION
-Cette page de manuel documente la version 1.7 de xxd.
-.SH AUTEUR
-(c) 1990-1997 par Juergen Weigert
-.br
-<jnweiger@informatik.uni-erlangen.de>
-.LP
-"Distribute freely and credit me,
-.br
-make money and share with me,
-.br
-lose money and don't ask me."
-.PP
-Distribution libre en citant l'auteur,
-.br
-gagnez de l'argent, pensez � moi,
-.br
-perdez de l'argent, oubliez-moi.
-.PP
-Page de manuel d�but�e par Tony Nugent
-.br
-<tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.br
-Modifications mineures par Bram Moolenaar.
-�dit� par Juergen Weigert.
-.SH TRADUCTION
-Cette page de manuel a �t� traduite par David Blanchet
-<david.blanchet@free.fr> 2004-12-24.
-Mise � jour 2013-05-10, Dominique Pell� <dominique.pelle@gmail.com>
diff --git a/runtime/doc/xxd-it.1 b/runtime/doc/xxd-it.1
deleted file mode 100755
index 3d8dabb950..0000000000
--- a/runtime/doc/xxd-it.1
+++ /dev/null
@@ -1,402 +0,0 @@
-.TH XXD 1 "Agosto 1996" "Pagina di manuale per xxd"
-.\"
-.\" 21 Maggio 1996
-.\" Autore della pagina di manuale:
-.\"    Tony Nugent <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.\"    Modificato da Bram Moolenaar <Bram@vim.org>
-.SH NOME
-.I xxd
-\- Produce esadecimale da un file binario o viceversa.
-.SH SINTASSI
-.B xxd
-\-h[elp]
-.br
-.B xxd
-[opzioni] [input_file [output_file]]
-.br
-.B xxd
-\-r[evert] [opzioni] [input_file [output_file]]
-.SH DESCRIZIONE
-.I xxd
-crea un'immagine esadecimale di un dato file o dello "standard input".
-Pu� anche ottenere da un'immagine esadecimale il file binario originale.
-Come
-.BR uuencode (1)
-e
-.BR uudecode (1)
-permette di trasmettere dati binari in una rappresentazione ASCII "a prova
-di email", ma ha anche il vantaggio di poter decodificare sullo "standard
-output".  Inoltre, pu� essere usato per effettuare delle modifiche (patch)
-a file binari.
-.SH OPZIONI
-Se non si specifica un
-.I input_file
-il programma legge dallo "standard input".
-Se
-.I input_file
-� specificato come il carattere
-.RB \` \- '
-, l'input � letto dallo "standard input".
-Se non si specifica un
-.I output_file
-(o si mette al suo posto il carattere
-.RB \` \- '
-), i risultati sono inviati allo "standard output".
-.PP
-Si noti che la scansione dei caratteri � "pigra", e non controlla oltre
-la prima lettera dell'opzione, a meno che l'opzione sia seguita da un
-parametro.
-Gli spazi fra una singola lettera di opzione e il corrispondente parametro
-dopo di essa sono facoltativi.
-I parametri delle opzioni possono essere specificati usando la notazione
-decimale, esadecimale oppure ottale.
-Pertanto
-.BR \-c8 ,
-.BR "\-c 8" ,
-.B \-c 010
-e
-.B \-cols 8
-sono notazioni equivalenti fra loro.
-.PP
-.TP
-.IR \-a " | " \-autoskip
-Richiesta di autoskip: Un singolo '*' rimpiazza linee di zeri binari.
-Valore di default: off.
-.TP
-.IR \-b " | " \-bits
-Richiesta di una immagine binaria (cifre binarie), invece che esadecimale.
-Questa opzione scrive un byte come otto cifre "1" e "0" invece di usare i
-numeri esadecimali. Ogni linea � preceduta da un indirizzo in esadecimale e
-seguita da una decodifica ascii (o ebcdic). Le opzioni specificabili dalla
-linea comando \-r, \-p, \-i non funzionano in questo modo.
-.TP
-.IR "\-c colonne " | " \-cols colonne"
-.IR "\-c colonne " | " \-cols colonne"
-In ogni linea sono formattate
-.RI < colonne >
-colonne. Valore di default 16 (\-i: 12, \-ps: 30, \-b: 6).
-Valore massimo 256.
-.TP
-.IR \-E " | " \-EBCDIC
-Cambia la codifica della colonna di destra da ASCII a EBCDIC.
-Questo non modifica la rappresentazione esadecimale. Non ha senso
-specificare questa opzione in combinazione con \-r, \-p o \-i.
-.TP
-.IR "\-g numero_byte " | " \-groupsize numero_byte"
-Inserisci ogni
-.RI < numero_byte >
-byte di output (di due caratteri esadecimali o otto numeri binari ognuno)
-uno spazio bianco.
-Specificando
-.I \-g 0
-i byte di output non sono separati da alcuno spazio.
-.RI < numero_byte > ha come valore di default " 2
-in modalit� normale [esadecimale] e \fI1\fP in modalit� binaria.
-Il raggruppamento non si applica agli stili "PostScript" e "include".
-.TP
-.IR \-h " | " \-help
-stampa un sommario dei comandi disponibili ed esce.  Non viene fatto
-null'altro.
-.TP
-.IR \-i " | " \-include
-L'output � nello stile dei file "include" in C.  Viene preparata la
-definizione completa di un "array" [vettore], dandogli il nome del
-file di input), tranne che nel caso in cui xxd legga dallo "standard input".
-.TP
-.IR "\-l numero " | " \-len numero"
-Il programma esce dopo aver scritto
-.RI  < numero >
-byte.
-.TP
-.IR \-p " | " \-ps " | " \-postscript " | " \-plain
-L'output � nello stile di un dump continuo sotto postscript.
-Noto anche come stile esadecimale semplice [plain].
-.TP
-.IR \-r " | " \-revert
-ricostruzione: converte (o mette una patch) a partire dall'immagine
-esadecimale, creando [o modificando] il file binario.
-Se non diretto allo "standard output", xxd scrive nel suo file di output
-in maniera continua, senza interruzioni.  Usare la combinazione
-.I \-r \-p
-per leggere dump in stile esadecimale semplice [plain], senza l'informazione
-di numero di linea e senza un particolare tracciato di colonna.  Degli spazi
-o delle linee vuote possono essere inserite a piacere [e vengono ignorate].
-.TP
-.I \-seek distanza
-Usato con l'opzione
-.IR \-r :
-(ricostruzione),
-.RI < distanza >
-viene aggiunta alla posizione nel file trovata nella immagine
-esadecimale.
-.TP
-.I \-s [+][\-]seek
-Inizia a
-.RI < seek >
-byte assoluti (o relativi) di distanza all'interno di input_file.
-\fI+ \fRindica che il "seek" � relativo alla posizione corrente nel file
-"standard input" (non significativa quando non si legge da "standard input").
-\fI\- \fRindica che il "seek" dovrebbe posizionarsi ad quel numero di
-caratteri dalla fine dell'input (o se in combinazione con
-\fI+ \fR: prime della posizione corrente nel file "standard input").
-Se non si specifica una opzione \-s, xxd inizia alla posizione
-corrente all'interno del file.
-.TP
-.I \-u
-usa lettere esadecimali maiuscole. Il valore di default � di usare
-lettere minuscole.
-.TP
-.IR \-v " | " \-version
-visualizza la stringa contenente la versione del programma.
-.SH ATTENZIONE
-.PP
-.I xxd \-r
-� capace di operare "magie" nell'utilizzare l'informazione "numero di linea".
-Se sul file di output ci si pu� posizionare usando la "seek", il numero di
-linea all'inizio di ogni riga esadecimale pu� essere non ordinato, delle
-linee possono mancare delle linee, oppure esserci delle sovrapposizioni.
-In simili casi xxd user� lseek(2) per raggiungere la posizione d'inizio.
-Se il file di output non consente di usare "seek", sono permessi solo dei
-"buchi", che saranno riempiti con zeri binari.
-.PP
-.I xxd \-r
-non genera mai errori di specifica parametri. I parametri non riconosciuti
-sono silenziosamente ignorati.
-.PP
-Nel modificare immagini esadecimali, tenete conto che
-.I xxd \-r
-salta il resto della linea, dopo aver letto abbastanza caratteri contenenti
-dati esadecimali (vedere opzione \-c). Ci� implica pure che le modifiche alle
-colonne di caratteri stampabili ascii (o ebcdic) sono sempre ignorate.
-La ricostruzione da un file immagine esadecimale in stile semplice
-(postscript) con xxd \-r \-p non dipende dal numero corretto di colonne. 
-IN questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali
-� interpretata [e utilizzata].
-.PP
-Notare la differenza fra
-.br
-\fI% xxd \-i file\fR
-.br
-e
-.br
-\fI% xxd \-i \< file\fR
-.PP
-.I xxd \-s \+seek
-pu� comportarsi in modo diverso da
-.IR "xxd \-s seek"
-, perch� lseek(2) � usata per tornare indietro nel file di input.  Il '+'
-fa differenza se il file di input � lo "standard input", e se la posizione nel
-file di "standard input" non � all'inizio del file quando xxd � eseguito,
-con questo input.
-I seguenti esempi possono contribuire a chiarire il concetto
-(o ad oscurarlo!)...
-.PP
-Riavvolge lo "standard input" prima di leggere; necessario perch� `cat'
-ha gi� letto lo stesso file ["file"] fino alla fine dello "standard input".
-.br
-\fI% sh \-c 'cat > copia_normale; xxd \-s 0 > copia_esadecimale' < file
-.PP
-Stampa immagine esadecimale dalla posizione file 0x480 (=1024+128) in poi.
-Il segno `+' vuol dire "rispetto alla posizione corrente", quindi il `128'
-si aggiunge a 1k (1024) dove `dd' si era fermato.
-.br
-\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +128 > esadecimale' < file
-.PP
-Immagine esadecimale dalla posizione 0x100 ( = 1024\-768 ) del file in avanti.
-.br
-\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +\-768 > esadecimale' < file
-.PP
-Comunque, questo capita raramente, e l'uso del `+' non serve quasi mai.
-L'autore preferisce monitorare il comportamento di xxd con strace(1) o
-truss(1), quando si usa l'opzione \-s.
-.SH ESEMPI
-.PP
-.br
-Stampa tutto tranne le prime tre linee (0x30 byte esadecimali) di
-.B file
-\.
-.br
-\fI% xxd \-s 0x30 file
-.PP
-.br
-Stampa 3 linee (0x30 byte esadecimali) alla fine di
-.B file
-\.
-.br
-\fI% xxd \-s \-0x30 file
-.PP
-.br
-Stampa 120 byte come immagine esadecimale continua con 20 byte per linea.
-.br
-\fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR
-
-.br
-2e54482058584420312022417567757374203139
-.br
-39362220224d616e75616c207061676520666f72
-.br
-20787864220a2e5c220a2e5c222032317374204d
-.br
-617920313939360a2e5c22204d616e2070616765
-.br
-20617574686f723a0a2e5c2220202020546f6e79
-.br
-204e7567656e74203c746f6e79407363746e7567
-.br
-
-.br
-Stampa i primi 120 byte della pagina di manuale vim.1 a 12 byte per linea.
-.br
-\fI% xxd \-l 120 \-c 12 xxd.1\fR
-
-
-.br
-0000000: 2e54 4820 5858 4420 3120 2241  .TH XXD 1 "A
-.br
-000000c: 7567 7573 7420 3139 3936 2220  ugust 1996" 
-.br
-0000018: 224d 616e 7561 6c20 7061 6765  "Manual page
-.br
-0000024: 2066 6f72 2078 7864 220a 2e5c   for xxd"..\
-.br
-0000030: 220a 2e5c 2220 3231 7374 204d  "..\" 21st M
-.br
-000003c: 6179 2031 3939 360a 2e5c 2220  ay 1996..\" 
-.br
-0000048: 4d61 6e20 7061 6765 2061 7574  Man page aut
-.br
-0000054: 686f 723a 0a2e 5c22 2020 2020  hor:..\"    
-.br
-0000060: 546f 6e79 204e 7567 656e 7420  Tony Nugent 
-.br
-000006c: 3c74 6f6e 7940 7363 746e 7567  <tony@sctnug
-.PP
-.br
-Visualizza la data dal file xxd.1
-.br
-\fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR
-.br
-0000036: 3231 7374 204d 6179 2031 3939 36  21st May 1996
-.PP
-.br
-Copiare
-.B input_file
-su
-.B output_file
-premettendogli 100 byte a 0x00.
-.br
-\fI% xxd input_file | xxd \-r \-s 100 \> output_file\fR
-.br
-
-.br
-Modificare (patch) la data nel file xxd.1
-.br
-\fI% echo '0000037: 3574 68' | xxd \-r \- xxd.1\fR
-.br
-\fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR
-.br
-0000036: 3235 7468 204d 6179 2031 3939 36  25th May 1996
-.PP
-.br
-Creare un file di 65537 byte tutto a 0x00,
-tranne che l'ultimo carattere che � una 'A' (esadecimale 0x41).
-.br
-\fI% echo '010000: 41' | xxd \-r \> file\fR
-.PP
-.br
-Stampa una immagine esadecimale del file  di cui sopra con opzione autoskip.
-.br
-\fI% xxd \-a \-c 12 file\fR
-.br
-0000000: 0000 0000 0000 0000 0000 0000  ............
-.br
-*
-.br
-000fffc: 0000 0000 40                   ....A
-.PP
-Crea un file di 1 byte che contiene il solo carattere 'A'.
-Il numero dopo '\-r \-s' viene aggiunto a quello trovato nel file;
-in pratica, i byte precedenti non sono stampati.
-.br
-\fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> file\fR
-.PP
-Usa xxd come filtro all'interno di un editor come
-.B vim(1)
-per ottenere una immagine esadecimale di una parte di file
-delimitata dai marcatori `a' e `z'.
-.br
-\fI:'a,'z!xxd\fR
-.PP
-Usare xxd come filtro all'interno di un editor come
-.B vim(1)
-per ricostruire un pezzo di file binario da una immagine esadecimale
-delimitata dai marcatori `a' e `z'.
-.br
-\fI:'a,'z!xxd \-r\fR
-.PP
-Usare xxd come filtro all'interno di un editor come
-.B vim(1)
-per ricostruire una sola linea di file binario da una immagine esadecimale,
-Portare il cursore sopra la linea e battere:
-.br
-\fI!!xxd \-r\fR
-.PP
-Per leggere singoli caratteri da una linea seriale
-.br
-\fI% xxd \-c1 < /dev/term/b &\fR
-.br
-\fI% stty < /dev/term/b \-echo \-opost \-isig \-icanon min 1\fR
-.br
-\fI% echo \-n foo > /dev/term/b\fR
-.PP
-.SH CODICI DI RITORNO
-Il programma pu� restituire questi codici di errore:
-.TP
-0
-nessun errore rilevato.
-.TP
-\-1
-operazione non supportata (
-.I xxd \-r \-i
-non ancora possible).
-.TP
-1
-errore durante la scansione parametri.
-.TP
-2
-problemi con il file di input.
-.TP
-3
-problemi con il file di output.
-.TP
-4,5
-posizione "seek" specificata non raggiungibile all'interno del file.
-.SH VEDERE ANCHE
-uuencode(1), uudecode(1), patch(1)
-.br
-.SH AVVERTIMENTI
-La stranezza dello strumento rispecchia la mente del suo creatore.
-Usate a vostro rischio e pericolo. Copiate i file. Tracciate l'esecuzione.
-Diventate un mago.
-.br
-.SH VERSIONE
-Questa pagina di manuale documenta la versione 1.7 di xxd.
-.SH AUTORE
-.br
-(c) 1990-1997 Juergen Weigert
-.br
-<jnweiger@informatik.uni\-erlangen.de>
-.LP
-Distribuite liberamente ed attribuitemi il credito,
-.br
-fate soldi e condivideteli con me
-.br
-perdete soldi e non venite a chiederli a me.
-.PP
-Pagina di manuale messa in piedi da Tony Nugent
-.br
-<tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.br
-Piccole modifiche di Bram Moolenaar.
-Modificato da Juergen Weigert.
-.PP
diff --git a/runtime/doc/xxd-pl.1 b/runtime/doc/xxd-pl.1
deleted file mode 100644
index d9fa9be203..0000000000
--- a/runtime/doc/xxd-pl.1
+++ /dev/null
@@ -1,389 +0,0 @@
-.TH XXD 1 "Sierpie� 1996" "Strona podr�cznika dla xxd"
-.\"
-.\" 21st May 1996
-.\" Man page author:
-.\"    Tony Nugent <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.\"    Changes by Bram Moolenaar <Bram@vim.org>
-.SH NAZWA
-.I xxd
-\- zrzut pliku do hex lub odwrotnie
-.SH SYNOPSIS
-.B xxd
-\-h[elp]
-.br
-.B xxd
-[opcje] [plik_we [plik_wy]]
-.br
-.B xxd
-\-r[evert] [opcje] [plik_we [plik_wy]]
-.SH OPIS
-.I xxd
-tworzy zrzut heksowy podanego pliku lub standardowego wej�cia.
-Mo�e tak�e przetworzy� zrzut heksowy z powrotem do oryginalnej,
-binarnej formy.
-Podobnie jak
-.BR uuencode (1)
-i
-.BR uudecode (1)
-pozwala na przekazanie danych binarnych w bezpiecznej w poczcie formie
-ASCII, ale ma zalety dekodowania na standardowe wyj�cie.
-Ponadto mo�na go u�y� do binarnego �atania plik�w.
-.SH OPCJE
-Je�li nie podano
-.I plik_we
-xxd czyta ze standardowego wej�cia.
-Je�li okre�lono
-.I plik_we
-jako znak
-.RB \` \- '
-wtedy dane wej�ciowe czytane s� ze standardowego wej�cia.
-Je�li nie podano
-.I plik_wy
-(lub podano jako
-.RB \` \- '
-), wyniki s� wysy�ane na standardowe wyj�cie.
-.PP
-Pami�taj, �e u�yty zosta� "leniwy" parser, kt�ry nie sprawdza wi�cej
-ni� pierwszej litery opcji (o ile ta nie zosta�a obdarzona
-parametrem). Spacje mi�dzy jedno literowymi opcjami i ich parametrami
-s� opcjonalne. Parametry opcji mog� by� okre�lone w notacji dziesi�tnej,
-heksadecymalej lub oktalnej.
-St�d
-.BR \-c8 ,
-.BR "\-c 8" ,
-.B \-c 010
-i
-.B \-cols 8
-s� sobie r�wnowa�ne.
-.PP
-.TP
-.IR \-a " | " \-autoskip
-prze��cza autoskip: pojedyncza '*' zast�puje linie nul. Domy�lnie
-wy��czone.
-.TP
-.IR \-b " | " \-bits
-Prze��cza do zrzutu bitowego (cyfr binarnych) zamiast heksowego.
-Opcja ta zapisuje oktety jako osiem cyfr 1 lub 0 zamiast normalnego
-zrzutu heksowego. Ka�da linia jest poprzedzona przez
-heksadecymalny numer linii a po nim jego reprezentacj� w ascii (lub
-ebcdic). Opcje linii polece� \-r, \-p, \-i nie dzia�aj� w tym
-trybie.
-.TP
-.IR "\-c cols " | " \-cols cols"
-formatuje liczb�
-.RI < cols >
-oktet�w na wiersz. Domy�lnie 16 (\-i: 12, \-ps: 30, \-b: 6). Maks.
-256.
-.TP
-.IR \-E " | "\-EBCDIC
-zmienia kodowanie znak�w w prawej kolumnie z ASCII na EBCDIC.
-Nie zmienia prezentacji heksadecymalej. Opcja nie dzia�a w po��czeniu
-z \-r, \-p lub \-i.
-.TP
-.IR "\-g bajt�w " | " \-groupsize bajt�w"
-oddziela wyj�cie ka�dych
-.RI < bajt�w >
-bajt�w (dwa heksowe znaki lub osiem cyfr binarnych ka�de) przez bia�y
-znak.
-Okre�l
-.I \-g 0
-by wy��czy� grupowanie.
-.RI < Bajt�w "> domy�lnie jest " 2
-w trybie normalnym i \fI1\fP w trybie bit�w.
-Grupowanie nie dzia�a w trybie postscriptu lub w��czania.
-.TP
-.IR \-h " | " \-help
-wypisuje podsumowanie dost�pnych polece� i ko�czy dzia�anie. Nie
-zostaje przeprowadzony �aden zrzut.
-.TP
-.IR \-i " | " \-include
-wyj�cie w stylu w��czania pliku w C. Zostaje zapisana kompletna
-statyczna tablica definicji (nazwana wed�ug pliku wej�cia), o ile xxd
-nie czyta ze standardowego wej�cia.
-.TP
-.IR "\-l len " | "\-len len"
-zako�cz po wypisaniu
-.RI < len >
-oktet�w.
-.TP
-.IR \-p " | " \-ps " | " \-postscript " | " \-plain
-wyj�cie w postcriptowym ci�g�ym stylu zrzutu heksowego. Znany tak�e
-jako zwyk�y zrzut heksowy.
-.TP
-.IR \-r " | " \-revert
-odwr�� operacj�: przekonwertuj (lub za�ataj) zrzut heksowy w binark�.
-Je�li nie zapisuje na standardowe wyj�cie, xxd zapisze plik wyj�ciowy
-bez obcinania go. U�yj kombinacji
-.I \-r \-p
-by odczyta� zwyk�y zrzut heksadecymalny bez numer�w linii
-i okre�lonego uk�adu kolumn. Dodatkowe bia�e znaki i �amanie wierszy
-s� wsz�dzie dozwolone.
-.TP
-.I \-seek offset
-Kiedy u�yty po
-.IR \-r :
-odwraca z
-.RI < offset >
-dodanym do pozycji w pliku odnalezionym w zrzucie heksowym.
-.TP
-.I \-s [+][\-]seek
-zaczyna na
-.RI < seek >
-bajt�w bezwgl�dnego (lub wzgl�dnego) offsetu pliku wej�ciowego.
-\fI+ \fRwskazuje, �e seek jest wzgl�dne do bie��cej pozycji pliku (bez
-znaczenia je�li nie wczytuje ze standardowego wej�cia). \fI\- \fRwskazuje
-�e seek powinno by� o tyle znak�w od ko�ca wej�cia (lub je�li
-po��czone z \fI+\fR: przed bie��c� pozycj� pliku na standardowym
-wej�ciu).
-Bez opcji \-s xxd zaczyna od bie��cej pozycji w pliku.
-.TP
-.I \-u
-u�yj wielkich liter w znakach heksowych. Domy�lnie s� ma�e znaki.
-.TP
-.IR \-v " | " \-version
-pokazuje wersj� programu.
-.SH OSTRZE�ENIA
-.PP
-.I xxd \-r
-potrafi okre�li� numery linii. Je�li plik wyj�cia jest mo�liwy do
-przeszukania wtedy numery linii na pocz�tku wiersza zrzutu heksowego
-mog� by� nie po kolei, mo�e brakowa� wierszy lub nak�ada� si� na
-siebie. W takich wypadkach xxd u�yje lseek(2) by znale�� nast�pn�
-pozycj�. Je�li plik wyj�ciowy nie jest mo�liwy do przeszukania mo�liwe
-s� tylko przerwy, kt�re zostan� wype�nione bajtami null.
-.PP
-.I xxd \-r
-nigdy nie podaje b��d�w analizy. �mieci s� po cichu ignorowane.
-.PP
-W czasie edycji zrzut�w heksowych, prosz� zauwa�y� �e
-.I xxd \-r
-pomija wszystko w linii wej�cia po odczytaniu wystarczaj�cej ilo�ci
-kolumn danych heksadecymalnych (zobacz opcj� \-c). Oznacza to tak�e,
-�e zmiany w drukowanych kolumnach ascii (lub ebcdic) s� zawsze
-ignorowane. Odwr�cenie zwyk�ego (lub postscriptowego) stylu zrzutu
-poprzez xxd \-r \-p nie zale�y od kolejno�ci kolumn. Tutaj cokolwiek
-co wygl�da jak para znak�w heks jest interpretowane.
-.PP
-Zauwa� r�nic� mi�dzy
-.br
-\fI% xxd \-i plik\fR
-.br
-i
-.br
-\fI% xxd \-i < plik\fR
-.PP
-.I xxd \-s \+seek
-mo�e by� r�ne od
-.IR "xxd \-s seek" ,
-poniewa� lseek(2) jest u�yty do "przewini�cie" wej�cia. '+' stanowi
-r�nic� je�li �r�d�em wej�cia jest standardowe wej�cie i je�li pozycja
-w pliku ze standardowego wej�cia nie jest pocz�tkiem pliku w chwili
-uruchomienia xxd. Nast�puj�ce przyk�ady mog� wyja�ni� (lub bardziej
-zmyli�!)...
-.PP
-Przewi� standardowe wej�cie przed przeczytaniem; potrzebne poniewa�
-`cat' ju� odczyta� do ko�ca standardowego wej�cia.
-.br
-\fI% sh \-c 'cat > zwyk�a_kopia; xxd \-s 0 > hex_kopia' < plik\fR
-.PP
-Zrzut heksowy od pozycji pliku 0x480 (=1024+128) w prz�d.
-Znak `+' oznacza "wzgl�dny wobec bie��cej pozycji", st�d `128' dodaje
-do 1k gdzie zako�czy� dd.
-.br
-\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +128 > hex_snippet' < file\fR
-.PP
-Zrzut heksowy od pozycji pliku 0x100 ( = 1024\-768) dalej.
-.br
-\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +-768 > hex_snippet' < file\fR
-.PP
-Jakkolwiek, jest to rzadka sytuacja i u�ycie `+' jest rzadko
-potrzebne.
-Autor woli monitorowa� dzia�anie xxd przy pomocy strace(1) lub truss(1) kiedy \-s jest u�yte.
-.SH PRZYK�ADY
-.PP
-.br
-Wypisz wszystko z wyj�tkiem pierwszych trzech linii (heksowe 0x30 bajt�w)
-.B pliku
-\.
-.br
-\fI% xxd \-s 0x30 plik\fR
-.PP
-.br
-Wypisz trzy linie (heksowe 0x30 bajt�w) z ko�ca
-.B pliku
-\.
-.br
-\fI% xxd \-s \-0x30 plik\fR
-.PP
-.br
-Wypisz 120 bajt�w jako ci�g�y zrzut heksowy z 20 oktetami na lini�.
-.br
-\fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR
-.br
-2e54482058584420312022417567757374203139
-.br
-39362220224d616e75616c207061676520666f72
-.br
-20787864220a2e5c220a2e5c222032317374204d
-.br
-617920313939360a2e5c22204d616e2070616765
-.br
-20617574686f723a0a2e5c2220202020546f6e79
-.br
-204e7567656e74203c746f6e79407363746e7567
-.br
-
-.br
-Zrzut heksowy z pierwszymi 120 bajtami tej strony podr�cznika z 12
-oktetami na lini�.
-.br
-\fI% xxd \-l 120 \-c 12 xxd.1\fR
-.br
-0000000: 2e54 4820 5858 4420 3120 2241  .TH XXD 1 "A
-.br
-000000c: 7567 7573 7420 3139 3936 2220  ugust 1996" 
-.br
-0000018: 224d 616e 7561 6c20 7061 6765  "Manual page
-.br
-0000024: 2066 6f72 2078 7864 220a 2e5c   for xxd"..\\
-.br
-0000030: 220a 2e5c 2220 3231 7374 204d  "..\\" 21st M
-.br
-000003c: 6179 2031 3939 360a 2e5c 2220  ay 1996..\\" 
-.br
-0000048: 4d61 6e20 7061 6765 2061 7574  Man page aut
-.br
-0000054: 686f 723a 0a2e 5c22 2020 2020  hor:..\\"    
-.br
-0000060: 546f 6e79 204e 7567 656e 7420  Tony Nugent 
-.br
-000006c: 3c74 6f6e 7940 7363 746e 7567  <tony@sctnug
-.PP
-.br
-Poka� tylko dat� z pliku xxd.1
-.br
-\fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR
-.br
-0000036: 3231 7374 204d 6179 2031 3939 36  21st May 1996
-.PP
-.br
-Kopiuj
-.B plik_we
-do
-.B plik_wy
-i poprzed� 100 bajtami o warto�ci 0x00.
-.br
-\fI% xxd plik_we | xxd \-r \-s 100 \> plik_wy\fR
-.br
-
-.br
-Podmie� dat� w pliku xxd.1
-.br
-\fI% echo '0000037: 3574 68' | xxd \-r \- xxd.1\fR
-.br
-\fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR
-.br
-0000036: 3235 7468 204d 6179 2031 3939 36  25th May 1996
-.PP
-.br
-Utw�rz plik o 65537 bajtach, wszystkich r�wnych 0x00,
-z wyj�tkiem ostatniego, kt�ry ma by� 'A' (hex 0x41).
-.br
-\fI% echo '010000: 41' | xxd \-r \> plik\fR
-.PP
-.br
-Zrzut heksowy tego pliku z autoskipem.
-.br
-\fI% xxd \-a \-c 12 plik\fR
-.br
-0000000: 0000 0000 0000 0000 0000 0000  ............
-.br
-*
-.br
-000fffc: 0000 0000 40                   ....A
-.PP
-Utw�rz jedno bajtowy plik zawieraj�cy pojedncz� liter� 'A'.
-Liczba po '\-r \-s' dodaje numery linii znalezione w pliku;
-w efekcie poprzedzaj�ce bajty s� ukryte.
-.br
-\fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> plik\fR
-.PP
-U�yj xxd jako filtra wewn�trz edytora takiego jak
-.B vim(1)
-aby uzyska� zrzut heksowy zakresu mi�dzy markerami `a' i `z'.
-.br
-\fI:'a,'z!xxd\fR
-.PP
-U�yj xxd jako filtra wewn�trz edytora takiego jak
-.B vim(1)
-by odzyska� binarny zrzut heksowy zakresu pomi�dzy markerami `a'
-i `z'.
-.br
-\fI:'a,'z!xxd \-r\fR
-.PP
-U�yj xxd jako filtra wewn�trz edytora takiego jak
-.B vim(1)
-by odzyska� jedn� lini� zrzutu heksowego. Przejd� z kursorem na lini�
-i wpisz:
-.br
-\fI!!xxd \-r\fR
-.PP
-Odczytaj pojednycze znaki z portu szeregowego
-.br
-\fI% xxd \-c1 < /dev/term/b &\fR
-.br
-\fI% stty < /dev/term/b \-echo \-opost \-isig \-icanon min 1\fR
-.br
-\fI% echo \-n foo > /dev/term/b\fR
-.PP
-.SH "ZWRACANE WARTO�CI"
-Zwracane s� nast�puj�ce warto�ci b��d�w:
-.TP
-0
-nie znaleziono b��d�w.
-.TP
-\-1
-operacja nie jest wspierana (
-.I xxd \-r \-i
-ca�y czas niemo�liwa).
-.TP
-1
-b��d w czasie analizowania opcji.
-.TP
-2
-problemy z plikiem wej�ciowym.
-.TP
-3
-problemy z plikiem wyj�ciowym.
-.TP
-4,5
-��dana pozycja jest nieosi�galna.
-.SH "ZOBACZ TAK�E"
-uuencode(1), uudecode(1), patch(1)
-.br
-.SH OSTRZE�ENIA
-Dziwaczno�� narz�dzi dor�wnuje dziwaczno�ci m�zgu tw�rcy.
-U�ywaj wy��cznie na w�asn� odpowiedzialno��. Kopiuj pliki. Analizuj
-je. Sta� si� czarodziejem.
-.br
-.SH WERSJA
-Strona podr�cznika opisuje xxd w wersji 1.7
-.SH AUTOR
-.br
-(c) 1990-1997 by Juergen Weigert
-.br
-<jnweiger@informatik.uni-erlangen.de>
-.LP
-Kopiuj do woli i podaj moje dane,
-.br
-zarabiaj pieni�dze i dziel si� ze mn�,
-.br
-tra� pieni�dze i nie miej do mnie pretensji.
-.PP
-Strona podr�cznika zapocz�tkowana przez Tony'ego Nugenta
-.br
-<tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.br
-Ma�e zmiany: Bram Moolenaar.
-Redakcja: Juergen Weigert.
-.PP
diff --git a/runtime/doc/xxd-ru.1 b/runtime/doc/xxd-ru.1
deleted file mode 100644
index 111946ab52..0000000000
--- a/runtime/doc/xxd-ru.1
+++ /dev/null
@@ -1,408 +0,0 @@
-.TH XXD 1 "August 1996" "�������� man ��� xxd"
-.\"
-.\" 21st May 1996
-.\" Man page author:
-.\"    Tony Nugent <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.\"    Changes by Bram Moolenaar <Bram@vim.org>
-.SH ���
-.I xxd
-\- ������� ������������� ����� � ���� ����������������� ����� ��� ���������
-�������� ��������������.
-.SH ��������� ������
-.B xxd
-\-h[elp]
-.br
-.B xxd
-[�����] [�������_���� [��������_����]]
-.br
-.B xxd
-\-r[evert] [�����] [�������_���� [��������_����]]
-.SH ��������
-.I xxd
-������� ������������� ���������� ����� ��� ������, ����������� �� ������
-������������ �����, � ���� ����������������� �����. ��� ������� ����� �����
-��������� �������� �������������� �������� ������������������ ������ ������
-� �������� �������� ������.
-������� ��������
-.BR uuencode(1)
-�
-.BR uudecode(1),
-��� ��������� ��������� �������������� �������� ������ � ASCII-���, 
-������� ����� ���������� �� ����������� �����, ������, ������ �����, ���������
-xxd ��������� ��������� ������������� � ����� ������������ ������,
-� ����� ����� ����������� ��� �������� �������� ��� �������� ������.
-.SH ����� �������
-����
-.I �������_����
-�� �����, �� ��������������� ������ �������� �� ������ ������������ �����.
-� ������, ���� � ��������
-.I ��������_�����
-������������ ������
-.RB \` \- ',
-���������� ������ ����� ��������� ����� ������������ �����.
-� ��� ������, ���� �� ������
-.I ��������_����
-(��� ������ ���� ������������ ������
-.RB \` \- '
-), ��������� �������������� ������������ � ����� ������������ ������.
-.PP
-�������� ��������, ��� ������������ "�������" �������� ������� ������, ������� ��
-��������� ����� ����� ����� �����, ���� � ���� ����� �� ������������ ��������.
-������� ����� ������������ �������� ����� � ��������������� ���������� �� ��������
-�������������. ��������� ������ ����� ���� ������ � �������������� �����������,
-������������������ ��� ������������� �������.
-����� �������, �����
-.BR \-c8 ,
-.BR "\-c 8" ,
-.B \-c 010
-�
-.B \-cols 8
-�������� �������������.
-.PP
-.TP
-.IR \-a " | " \-autoskip
-�������� �������������� �������: ������ ������������������
-������� ����� ������������ ��������� ������ '*'. �� ���������
-�� �����������.
-.TP
-.IR \-b " | " \-bits
-������ ������������������ ���� ������������ ���� (�������� �����).
-��� ������������� ����� ����� ������ �������� ������������������ �������������
-������� ������������ ������ �� ������ �������� "1" � "0". ������ ������
-������������ ������� ������ � ����������������� ����, � ����������� ���������� 
-�������������� (� ���� ascii ��� ebcdic). ����� \-r, \-p, \-i � ���� ������
-�� ��������.
-.TP
-.IR "\-c ��� " | " \-cols ���"
-������ ���������� �������
-.RI < ��� >,
-������� ��������� �� ������ ������. �� ��������� ������������ �������� 16 
-(\-i: 12, \-ps: 30, \-b: 6). 
-����������� ���������� ��������: 256.
-.TP
-.IR \-E " | " \-EBCDIC
-�������� ������ ����������� �������� � ������ ������� � ASCII �� EBCDIC. ���� ����
-�� �������� ����������������� �������������. ������ ���� �� ����� ������,
-���� ������������ ����� \-r, \-p ��� \-i.
-.TP
-.IR "\-g ���� " | " \-groupsize ����"
-��������� ��������� ����������� ���������� ����������
-.RI < ������ >
-(��� ����������������� ����� ��� ������ �����), ������� ������ ���� �� ����� ���������.
-��������
-.I \-g 0 
-����������� ��� ������ �� ������������� �����������.
-�� ��������� ������������ ��������
-.RI < ���� "> ������ " 2
-� ������� ������ � \fI1\fP � ������� ������. ����������� �� �����������
-� ������� postscript � include.
-.TP
-.IR \-h " | " \-help
-������� ������� �� ��������� ������ ��������� ������ � ��������� ������ ���������.
-�������� ������������������ ������������� �� �����������.
-.TP
-.IR \-i " | " \-include
-��������� ��������� ����� � ����� ������������ ������������ ������ ����� C.
-����� �������� ����������� ����������� ������������ ������� ������, ��� ��������
-������������� ����� �������� �����, ���� xxd �� ��������� ������ �� ������ ������������
-�����.
-.TP
-.IR "\-l ����� " | " \-len �����"
-��������� ������ ����� ������ ��������� � ���������
-.RI  < ����� >
-���������� �������.
-.TP
-.IR \-p " | " \-ps " | " \-postscript " | " \-plain
-���������� ����������� ������ ������ ������������������ ����, 
-��������� ��� "�������" ����� ��� ����� "postscript".
-.TP
-.IR \-r " | " \-revert
-�������� ����� �������� �� ���������������: ��������� ��������� �������������� 
-������������������ ������������� � �������� ��� (��� ��������� ��������� � �������� �������).
-���� ����� ���������� �� � ����� ������������ ������, �� xxd ��������� ���������� ���� 
-� ���������������� �����. ��� ������������� ���������� ������
-.I \-r \-p
-���������� ������ "��������" ������������������ ������������� ��� �������������
-���������� � ������� ����� � ������-���� ������������ ������� �������. ������� 
-� ������� ����� ������ ����� ����������� � ����� ����� �������� ������.
-.TP
-.I \-seek ��������
-��� ������������� ����� �����
-.I \-r
-: ��������� ���������
-.RI < �������� >
-� �������� ��������, ������������ � �������� ������.
-.TP
-.I \-s [\+][\-]seek
-�������� ������ � ���������� ����������� (��� ��������������)
-.RI < �������� >
-� ������ �� �������_�����.
-\fI\+ \fR���������, ��� �������� �������� ������������� �� ���������
-� ������� �������� ������� � ������ ������������ ����� (������������, ���� ������
-���������� �� �� ������ ������������ �����). \fI\- \fR���������, ��� ������ ���� ���������
-��������� ���������� �������� �� ����� ����� (����, ���� ���������� � \fI \+ \fR: 
-����� ������� ������� ����� � ������ ������������ �����).
-���� ���� \-s �� ������������, �� xxd �������� ������ �� ������� ������� � �����.
-.TP
-.I \-u
-���������� ����������������� ����� � ������� ��������. �� ��������� ������������ ����� �
-������ �������� ��������.
-.TP
-.IR \-v " | " \-version
-���������� ���������� � ������ ���������.
-.SH ��������� �����
-.PP
-.I xxd \-r
-�������� ���������� ����������� ��� ������������� ���������� � ������� �����.
-���� �������� ����� �� �������� �����, �� ������ ����� � ������ ������ ������
-������������������ ������������� ����� ���� ����������������, ��������� ������ �����
-���� ��������� ��� ������������ ���� � ������. � ���� ������� xxd ����������
-lseek(2) ��� �������� � ��������� �������. ���� ����� �� �������� ����� 
-����������, �� ��������� ������ �������� �����, ������� ����������� �������� 
-�������.
-.PP
-.I xxd \-r
-������� �� ������� ��������� �� �������. ����� ������������ �����.
-.PP
-��� �������������� ����������������� ������������� �������� ������ ��������� 
-��������, ��� 
-.I xxd \-r
-���������� � ������ ����� ����� ������ ����� ��������� ������������ ���������� 
-������� ����������������� ������ (��. ���� \-c). ��� ��������, ��� ���������,
-��������� � ������� � ��������� ��������� ascii (��� ebcdic), ������ ������������.
-��� �������� �������������� ������������������ ������������� � �����
-postscript � ������� ������� xxd \-r \-p ���������� ������� �� �����������. 
-� ���� ������ ������������ ��� �������, ������� ������ �� ���� ����������������� ����.
-.PP
-�������� �������� �� �������� ����� ���������
-.PP
-\fI% xxd \-i ����\fR
-.PP
-�
-.PP
-\fI% xxd \-i \< ����\fR
-.PP
-�������
-.I xxd \-s \+seek
-����� ���������� ��
-.I xxd \-s seek,
-��������� ��� ����, ����� "��������" ������ �� ����� �����, ������������ ����� lseek(2).
-��� ������������� `+' ��������� ����� ����������, ���� ������� ������
-��������� � ������ ������������ �����, � ������� � ����� ������������ ����� �� ���������
-� ������ ����� � ���� �������, ����� ��������� xxd �������� � ���������� � ������ �����.
-������������� ������� ������� ��������� (��� �ݣ ������ ��������!) ��������...
-.PP
-������� ����� ������ ������������ �����; ����������, ��������� 'cat' ��� ���������
-������ �� ����� ������ ������������ �����:
-.PP
-\fI% sh \-c 'cat > plain_copy; xxd \-s 0 > hex_copy' < file
-.PP
-����� ������������������ ������������� �� ������� � ����� 0x480 
-(= 1024+128).
-������ `+' �������� "������������ ������� �������", ����� ������� `128' �����������
-� ������� ���������, ��� ��������� ������ dd:
-.PP
-\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +128 > hex_snippet' < file
-.PP
-����� ������������������ ������������� �� ������� � ����� 0x100 
-(= 1024-768):
-.PP
-\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +-768 > hex_snippet' < file
-.PP
-� �� �� �����, ������� ��������, ��� �������� �������� ����������� �������� �����,
-��� ��� ������ `+' ������ �� ������������. ����� ������������ ��������� �� ������� 
-xxd � ������� strace(1) ��� truss(1) � ��� �������, ����� ����������� ����
-\-s.
-.SH �������
-.PP
-.br
-������� �ӣ, ����� ������ �ң� ����� (0x30 ������) �����
-.B file
-:
-.PP
-\fI% xxd \-s 0x30 file
-.PP
-.br
-������� ��� ������ (0x30 ������) �� ����� �����
-.B file
-:
-.PP
-\fI% xxd \-s \-0x30 file
-.PP
-.br
-������� 120 ������ � ���� ������������ ������������������ �������������
-�� 20 ������� � ������:
-.PP
-\fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR
-.br
-2e544820585844203120224d616e75616c207061
-.br
-676520666f7220787864220a2e5c220a2e5c2220
-.br
-32317374204d617920313939360a2e5c22204d61
-.br
-6e207061676520617574686f723a0a2e5c222020
-.br
-2020546f6e79204e7567656e74203c746f6e7940
-.br
-7363746e7567656e2e7070702e67752e6564752e
-.br
-.PP
-.br
-������� ������ 120 ������ ���� �������� ����������� �� 12 ������� � ������:
-.PP
-\fI% xxd \-l 120 \-c 12 xxd.1\fR
-.br
-0000000: 2e54 4820 5858 4420 3120 224d  .TH XXD 1 "M
-.br
-000000c: 616e 7561 6c20 7061 6765 2066  anual page f
-.br
-0000018: 6f72 2078 7864 220a 2e5c 220a  or xxd"..\\".
-.br
-0000024: 2e5c 2220 3231 7374 204d 6179  .\\" 21st May
-.br
-0000030: 2031 3939 360a 2e5c 2220 4d61   1996..\\" Ma
-.br
-000003c: 6e20 7061 6765 2061 7574 686f  n page autho
-.br
-0000048: 723a 0a2e 5c22 2020 2020 546f  r:..\\"    To
-.br
-0000054: 6e79 204e 7567 656e 7420 3c74  ny Nugent <t
-.br
-0000060: 6f6e 7940 7363 746e 7567 656e  ony@sctnugen
-.br
-000006c: 2e70 7070 2e67 752e 6564 752e  .ppp.gu.edu.
-.PP
-.br
-�������� ���� �� ����� xxd.1:
-.PP
-\fI% xxd \-s 0x28 \-l 12 \-c 12 xxd.1\fR
-.br
-0000028: 3231 7374 204d 6179 2031 3939  21st May 199
-.PP
-.br
-�����������
-.B �������_����
-�
-.B ��������_����
-� ����������� 100 ������ �� ��������� 0x00 � ������ �����:
-.PP
-\fI% xxd �������_���� | xxd \-r \-s 100 \> ��������_����\fR
-.br
-.PP
-.br
-�������� ���� � ����� xxd.1:
-.PP
-\fI% echo '0000029: 3574 68' | xxd \-r \- xxd.1\fR
-.br
-\fI% xxd \-s 0x28 \-l 12 \-c 12 xxd.1\fR
-.br
-0000028: 3235 7468 204d 6179 2031 3939  25th May 199
-.PP
-.br
-������� 65537-������� ����, ��� ����� �������� ����� ��������
-0x00, ����� ���������� �����, ������� ������ ����� �������� 'A'
-(0x41):
-.PP
-\fI% echo '010000: 41' | xxd \-r \> file\fR
-.PP
-.br
-������� ����������������� ������������� ����� ����� � 
-�������������� ��������������� ��������:
-.PP
-\fI% xxd \-a \-c 12 file\fR
-.br
-0000000: 0000 0000 0000 0000 0000 0000  ............
-.br
-*
-.br
-000fffc: 0000 0000 40                   ....A
-.PP
-������� 1-������� ����, ���������� ������ 'A'.
-����� ����� '\-r \-s' ����������� � ������� �����, ��������� � �����;
-����� ������, �������������� ����� ������������:
-.PP
-\fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> file\fR
-.PP
-xxd ����� ������������ � �������� ������� � ���������, �������� � 
-.B vim(1),
-����� ������� ����������������� ������������� ������� �����
-��������� `a' � `z':
-.PP
-\fI:'a,'z!xxd\fR
-.PP
-�� ������ ������������ xxd � �������� ������� � ���������, �������� � 
-.B vim(1),
-��� �������������� ������ �� ������������������ �������������
-����� ��������� `a' � `z':
-.PP
-\fI:'a,'z!xxd \-r\fR
-.PP
-�� ������ ������������ xxd � �������� ������� � ���������, �������� �
-.B vim(1),
-��� �������������� ������ �� ������������ ������
-������������������ �������������. ��������� ������ � ��������������� ������
-� ��������
-.PP
-\fI!!xxd \-r\fR
-.PP
-����� ��������� ������������ ������ �� ������ �����:
-.PP
-\fI% xxd \-c1 < /dev/term/b &\fR
-.br
-\fI% stty < /dev/term/b \-echo \-opost \-isig \-icanon min 1\fR
-.br
-\fI% echo \-n foo > /dev/term/b\fR
-.PP
-.SH ������������ ��������
-��������� xxd ��������� ������ �� ���������� ����������:
-.TP
-0
-������ �� ����������.
-.TP
-\-1
-�������� �� �������������� (����������
-.I xxd \-r \-i
-���� ����������).
-.TP
-1
-������ ��� ������� ������ ��������� ������.
-.TP
-2
-�������� �� ������� �����.
-.TP
-3
-�������� � �������� �����.
-.TP
-4,5
-����������� ������� ������ �����������.
-.SH ������ �����
-uuencode(1), uudecode(1), patch(1)
-.br
-.SH ��������������
-���������� ���� ��������� ������������� ������������ ����� ţ ���������.
-����������� ţ �� ���� ����� � ����. ��������� �����, ������������
-������, ����������� �����������.
-.br
-.SH ������
-��� �������� ����������� ������������� xxd ������ 1.7.
-.SH �����
-.br
-(c) 1990-1997 ����� ������� (Juergen Weigert)
-.br
-<jnweiger@informatik.uni-erlangen.de>
-.LP
-�� ������ �������� �������������� ��������� �� ������� �� ����.
-.br
-���� ������������� ���� ��������� �������� ��� �����-�� �����,
-���������� �� ����.
-.br
-���� �� �������� ������, �� � ��� �� ���ޣ�.
-.PP
-������ ������� �������� ����������� ������� ���� ��������� (Tony Nugent)
-.br
-<tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-.br
-��������� ��������� ������� ������ ����������� (Bram Moolenaar).
-�������� ��������������� ������� ��������� (Juergen Weigert).
-.PP
diff --git a/runtime/doc/xxd.man b/runtime/doc/xxd.man
deleted file mode 100644
index 057c8e911b..0000000000
--- a/runtime/doc/xxd.man
+++ /dev/null
@@ -1,262 +0,0 @@
-XXD(1)                                                                  XXD(1)
-
-
-
-NAME
-       xxd - make a hexdump or do the reverse.
-
-SYNOPSIS
-       xxd -h[elp]
-       xxd [options] [infile [outfile]]
-       xxd -r[evert] [options] [infile [outfile]]
-
-DESCRIPTION
-       xxd  creates a hex dump of a given file or standard input.  It can also
-       convert a hex dump back to its original binary form.  Like  uuencode(1)
-       and  uudecode(1)  it allows the transmission of binary data in a `mail-
-       safe' ASCII representation, but has the advantage of decoding to  stan-
-       dard output.  Moreover, it can be used to perform binary file patching.
-
-OPTIONS
-       If no infile is given, standard input is read.  If infile is  specified
-       as  a  `-'  character,  then input is taken from standard input.  If no
-       outfile is given (or a `-' character is in its place), results are sent
-       to standard output.
-
-       Note  that  a  "lazy" parser is used which does not check for more than
-       the first option letter, unless the option is followed by a  parameter.
-       Spaces  between  a single option letter and its parameter are optional.
-       Parameters to options can be specified in decimal, hexadecimal or octal
-       notation.  Thus -c8, -c 8, -c 010 and -cols 8 are all equivalent.
-
-
-       -a | -autoskip
-              toggle  autoskip: A single '*' replaces nul-lines.  Default off.
-
-       -b | -bits
-              Switch to bits (binary digits) dump, rather than hexdump.   This
-              option  writes octets as eight digits "1"s and "0"s instead of a
-              normal hexadecimal dump. Each line is preceded by a line  number
-              in  hexadecimal and followed by an ascii (or ebcdic) representa-
-              tion. The command line switches -r, -p, -i do not work with this
-              mode.
-
-       -c cols | -cols cols
-              format  <cols> octets per line. Default 16 (-i: 12, -ps: 30, -b:
-              6). Max 256.
-
-       -E | -EBCDIC
-              Change the character encoding in the righthand column from ASCII
-              to EBCDIC.  This does not change the hexadecimal representation.
-              The option is meaningless in combinations with -r, -p or -i.
-
-       -g bytes | -groupsize bytes
-              separate the output of every <bytes> bytes (two  hex  characters
-              or eight bit-digits each) by a whitespace.  Specify -g 0 to sup-
-              press grouping.  <Bytes> defaults to 2 in normal mode and  1  in
-              bits  mode.   Grouping  does  not apply to postscript or include
-              style.
-
-       -h | -help
-              print a summary of available commands and exit.  No hex  dumping
-              is performed.
-
-       -i | -include
-              output  in C include file style. A complete static array defini-
-              tion is written (named after the input file), unless  xxd  reads
-              from stdin.
-
-       -l len | -len len
-              stop after writing <len> octets.
-
-       -p | -ps | -postscript | -plain
-              output  in  postscript  continuous  hexdump style. Also known as
-              plain hexdump style.
-
-       -r | -revert
-              reverse operation: convert (or patch) hexdump into  binary.   If
-              not  writing  to stdout, xxd writes into its output file without
-              truncating it. Use the combination -r -p to read plain hexadeci-
-              mal dumps without line number information and without a particu-
-              lar column layout. Additional  Whitespace  and  line-breaks  are
-              allowed anywhere.
-
-       -seek offset
-              When used after -r: revert with <offset> added to file positions
-              found in hexdump.
-
-       -s [+][-]seek
-              start at <seek> bytes abs. (or rel.) infile offset.  + indicates
-              that  the  seek  is  relative to the current stdin file position
-              (meaningless when not reading from stdin).  - indicates that the
-              seek  should  be  that many characters from the end of the input
-              (or if combined with +: before the current stdin file position).
-              Without -s option, xxd starts at the current file position.
-
-       -u     use upper case hex letters. Default is lower case.
-
-       -v | -version
-              show version string.
-
-CAVEATS
-       xxd -r has some builtin magic while evaluating line number information.
-       If the output file is seekable, then the linenumbers at  the  start  of
-       each  hexdump  line may be out of order, lines may be missing, or over-
-       lapping. In these cases xxd will lseek(2) to the next position. If  the
-       output  file  is  not  seekable,  only  gaps are allowed, which will be
-       filled by null-bytes.
-
-       xxd -r never generates parse errors. Garbage is silently skipped.
-
-       When editing hexdumps, please note that xxd -r skips everything on  the
-       input line after reading enough columns of hexadecimal data (see option
-       -c). This also means, that changes to the printable ascii  (or  ebcdic)
-       columns  are  always  ignored.  Reverting a plain (or postscript) style
-       hexdump with xxd -r -p does not depend on the correct  number  of  col-
-       umns.  Here  anything  that  looks  like a pair of hex-digits is inter-
-       preted.
-
-       Note the difference between
-       % xxd -i file
-       and
-       % xxd -i < file
-
-       xxd -s +seek may be different from xxd -s seek, as lseek(2) is used  to
-       "rewind" input.  A '+' makes a difference if the input source is stdin,
-       and if stdin's file position is not at the start of  the  file  by  the
-       time  xxd  is  started and given its input.  The following examples may
-       help to clarify (or further confuse!)...
-
-       Rewind stdin before reading; needed because the `cat' has already  read
-       to the end of stdin.
-       % sh -c "cat > plain_copy; xxd -s 0 > hex_copy" < file
-
-       Hexdump  from  file  position  0x480 (=1024+128) onwards.  The `+' sign
-       means "relative to the current position", thus the `128' adds to the 1k
-       where dd left off.
-       %  sh -c "dd of=plain_snippet bs=1k count=1; xxd -s +128 > hex_snippet"
-       < file
-
-       Hexdump from file position 0x100 ( = 1024-768) on.
-       % sh -c "dd of=plain_snippet bs=1k count=1; xxd -s +-768 > hex_snippet"
-       < file
-
-       However,  this is a rare situation and the use of `+' is rarely needed.
-       The author prefers to monitor the  effect  of  xxd  with  strace(1)  or
-       truss(1), whenever -s is used.
-
-EXAMPLES
-       Print everything but the first three lines (hex 0x30 bytes) of file.
-       % xxd -s 0x30 file
-
-       Print 3 lines (hex 0x30 bytes) from the end of file.
-       % xxd -s -0x30 file
-
-       Print 120 bytes as continuous hexdump with 20 octets per line.
-       % xxd -l 120 -ps -c 20 xxd.1
-       2e54482058584420312022417567757374203139
-       39362220224d616e75616c207061676520666f72
-       20787864220a2e5c220a2e5c222032317374204d
-       617920313939360a2e5c22204d616e2070616765
-       20617574686f723a0a2e5c2220202020546f6e79
-       204e7567656e74203c746f6e79407363746e7567
-
-       Hexdump the first 120 bytes of this man page with 12 octets per line.
-       % xxd -l 120 -c 12 xxd.1
-       0000000: 2e54 4820 5858 4420 3120 2241  .TH XXD 1 "A
-       000000c: 7567 7573 7420 3139 3936 2220  ugust 1996"
-       0000018: 224d 616e 7561 6c20 7061 6765  "Manual page
-       0000024: 2066 6f72 2078 7864 220a 2e5c   for xxd"..\
-       0000030: 220a 2e5c 2220 3231 7374 204d  "..\" 21st M
-       000003c: 6179 2031 3939 360a 2e5c 2220  ay 1996..\"
-       0000048: 4d61 6e20 7061 6765 2061 7574  Man page aut
-       0000054: 686f 723a 0a2e 5c22 2020 2020  hor:..\"
-       0000060: 546f 6e79 204e 7567 656e 7420  Tony Nugent
-       000006c: 3c74 6f6e 7940 7363 746e 7567  <tony@sctnug
-
-       Display just the date from the file xxd.1
-       % xxd -s 0x36 -l 13 -c 13 xxd.1
-       0000036: 3231 7374 204d 6179 2031 3939 36  21st May 1996
-
-       Copy input_file to output_file and prepend 100 bytes of value 0x00.
-       % xxd input_file | xxd -r -s 100 > output_file
-
-       Patch the date in the file xxd.1
-       % echo "0000037: 3574 68" | xxd -r - xxd.1
-       % xxd -s 0x36 -l 13 -c 13 xxd.1
-       0000036: 3235 7468 204d 6179 2031 3939 36  25th May 1996
-
-       Create  a  65537 byte file with all bytes 0x00, except for the last one
-       which is 'A' (hex 0x41).
-       % echo "010000: 41" | xxd -r > file
-
-       Hexdump this file with autoskip.
-       % xxd -a -c 12 file
-       0000000: 0000 0000 0000 0000 0000 0000  ............
-       *
-       000fffc: 0000 0000 40                   ....A
-
-       Create a 1 byte file containing a single  'A'  character.   The  number
-       after '-r -s' adds to the linenumbers found in the file; in effect, the
-       leading bytes are suppressed.
-       % echo "010000: 41" | xxd -r -s -0x10000 > file
-
-       Use xxd as a filter within an editor such as vim(1) to hexdump a region
-       marked between `a' and `z'.
-       :'a,'z!xxd
-
-       Use xxd as a filter within an editor such as vim(1) to recover a binary
-       hexdump marked between `a' and `z'.
-       :'a,'z!xxd -r
-
-       Use xxd as a filter within an editor such as vim(1) to recover one line
-       of a hexdump.  Move the cursor over the line and type:
-       !!xxd -r
-
-       Read single characters from a serial line
-       % xxd -c1 < /dev/term/b &
-       % stty < /dev/term/b -echo -opost -isig -icanon min 1
-       % echo -n foo > /dev/term/b
-
-
-RETURN VALUES
-       The following error values are returned:
-
-       0      no errors encountered.
-
-       -1     operation not supported ( xxd -r -i still impossible).
-
-       1      error while parsing options.
-
-       2      problems with input file.
-
-       3      problems with output file.
-
-       4,5    desired seek position is unreachable.
-
-SEE ALSO
-       uuencode(1), uudecode(1), patch(1)
-
-WARNINGS
-       The  tools  weirdness matches its creators brain.  Use entirely at your
-       own risk. Copy files. Trace it. Become a wizard.
-
-VERSION
-       This manual page documents xxd version 1.7
-
-AUTHOR
-       (c) 1990-1997 by Juergen Weigert
-       <jnweiger@informatik.uni-erlangen.de>
-
-       Distribute freely and credit me,
-       make money and share with me,
-       lose money and don't ask me.
-
-       Manual page started by Tony Nugent
-       <tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
-       Small changes by Bram Moolenaar.  Edited by Juergen Weigert.
-
-
-
-
-Manual page for xxd               August 1996                           XXD(1)
diff --git a/runtime/indent/lifelines.vim b/runtime/indent/lifelines.vim
index 0d9b2b46e4..0d9b2b46e4 100755..100644
--- a/runtime/indent/lifelines.vim
+++ b/runtime/indent/lifelines.vim
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 83de3347bd..208df31596 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -174,7 +174,7 @@ if(NOT DEFINED ENV{SKIP_EXEC})
   add_executable(nvim ${NEOVIM_GENERATED_SOURCES} ${NEOVIM_SOURCES}
     ${NEOVIM_HEADERS})
   target_link_libraries(nvim ${NVIM_LINK_LIBRARIES})
-  install(TARGETS nvim RUNTIME DESTINATION bin)
+  install_helper(TARGETS nvim)
 endif()
 
 if(NOT DEFINED ENV{SKIP_UNITTEST})
diff --git a/src/nvim/api/tabpage.c b/src/nvim/api/tabpage.c
index 72168d936a..3e5d00671a 100644
--- a/src/nvim/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
@@ -7,6 +7,7 @@
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/memory.h"
+#include "nvim/window.h"
 
 /// Gets the number of windows in a tabpage
 ///
@@ -18,27 +19,18 @@ ArrayOf(Window) tabpage_get_windows(Tabpage tabpage, Error *err)
   Array rv = ARRAY_DICT_INIT;
   tabpage_T *tab = find_tab_by_handle(tabpage, err);
 
-  if (!tab) {
+  if (!tab || !valid_tabpage(tab)) {
     return rv;
   }
 
-  tabpage_T *tp;
-  win_T *wp;
-
-  FOR_ALL_TAB_WINDOWS(tp, wp) {
-    if (tp != tab) {
-      break;
-    }
+  FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
     rv.size++;
   }
 
   rv.items = xmalloc(sizeof(Object) * rv.size);
   size_t i = 0;
 
-  FOR_ALL_TAB_WINDOWS(tp, wp) {
-    if (tp != tab) {
-      break;
-    }
+  FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
     rv.items[i++] = WINDOW_OBJ(wp->handle);
   }
 
@@ -90,18 +82,15 @@ Window tabpage_get_window(Tabpage tabpage, Error *err)
   Window rv = 0;
   tabpage_T *tab = find_tab_by_handle(tabpage, err);
 
-  if (!tab) {
+  if (!tab || !valid_tabpage(tab)) {
     return rv;
   }
 
   if (tab == curtab) {
     return vim_get_current_window();
   } else {
-    tabpage_T *tp;
-    win_T *wp;
-
-    FOR_ALL_TAB_WINDOWS(tp, wp) {
-      if (tp == tab && wp == tab->tp_curwin) {
+    FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
+      if (wp == tab->tp_curwin) {
         return wp->handle;
       }
     }
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 93aa0439f0..5e0f3e0c32 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -380,8 +380,6 @@ void vim_set_current_buffer(Buffer buffer, Error *err)
 ArrayOf(Window) vim_get_windows(void)
 {
   Array rv = ARRAY_DICT_INIT;
-  tabpage_T *tp;
-  win_T *wp;
 
   FOR_ALL_TAB_WINDOWS(tp, wp) {
     rv.size++;
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 31fa54295a..83cddb85bf 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -514,13 +514,9 @@ void buf_freeall(buf_T *buf, int flags)
     reset_synblock(curwin);
 
   /* No folds in an empty buffer. */
-  {
-    win_T           *win;
-    tabpage_T       *tp;
-
-    FOR_ALL_TAB_WINDOWS(tp, win) {
-      if (win->w_buffer == buf)
-        clearFolding(win);
+  FOR_ALL_TAB_WINDOWS(tp, win) {
+    if (win->w_buffer == buf) {
+      clearFolding(win);
     }
   }
 
@@ -4206,8 +4202,6 @@ int read_viminfo_bufferlist(vir_T *virp, int writing)
 
 void write_viminfo_bufferlist(FILE *fp)
 {
-  win_T       *win;
-  tabpage_T   *tp;
   char_u      *line;
   int max_buffers;
 
@@ -4284,8 +4278,12 @@ char_u *buf_spname(buf_T *buf)
  */
 bool find_win_for_buf(buf_T *buf, win_T **wp, tabpage_T **tp)
 {
-  FOR_ALL_TAB_WINDOWS(*tp, *wp) {
-    if ((*wp)->w_buffer == buf) {
+  *wp = NULL;
+  *tp = NULL;
+  FOR_ALL_TAB_WINDOWS(tp2, wp2) {
+    if (wp2->w_buffer == buf) {
+      *tp = tp2;
+      *wp = wp2;
       return true;
     }
   }
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 8f540fbe09..7927473439 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -62,8 +62,7 @@ static int diff_a_works = MAYBE;
 /// @param buf
 void diff_buf_delete(buf_T *buf)
 {
-  tabpage_T *tp;
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+  FOR_ALL_TABS(tp) {
     int i = diff_buf_idx_tp(buf, tp);
 
     if (i != DB_COUNT) {
@@ -175,8 +174,7 @@ static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
 /// @param buf
 void diff_invalidate(buf_T *buf)
 {
-  tabpage_T *tp;
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+  FOR_ALL_TABS(tp) {
     int i = diff_buf_idx_tp(buf, tp);
     if (i != DB_COUNT) {
       tp->tp_diff_invalid = TRUE;
@@ -197,8 +195,7 @@ void diff_mark_adjust(linenr_T line1, linenr_T line2, long amount,
                       long amount_after)
 {
   // Handle all tab pages that use the current buffer in a diff.
-  tabpage_T *tp;
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+  FOR_ALL_TABS(tp) {
     int idx = diff_buf_idx_tp(curbuf, tp);
     if (idx != DB_COUNT) {
       diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
@@ -1819,8 +1816,7 @@ int diffopt_changed(void)
 
   // If "icase" or "iwhite" was added or removed, need to update the diff.
   if (diff_flags != diff_flags_new) {
-    tabpage_T *tp;
-    for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+    FOR_ALL_TABS(tp) {
       tp->tp_diff_invalid = TRUE;
     }
   }
@@ -2376,15 +2372,14 @@ static void diff_fold_update(diff_T *dp, int skip_idx)
 /// @param buf The buffer to check.
 ///
 /// @return TRUE if buffer "buf" is in diff-mode.
-int diff_mode_buf(buf_T *buf)
+bool diff_mode_buf(buf_T *buf)
 {
-  tabpage_T *tp;
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+  FOR_ALL_TABS(tp) {
     if (diff_buf_idx_tp(buf, tp) != DB_COUNT) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /// Move "count" times in direction "dir" to the next diff block.
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 3b450e5245..5131dc3b38 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -5610,12 +5610,18 @@ static void spell_back_to_badword(void)
 int stop_arrow(void)
 {
   if (arrow_used) {
+    Insstart = curwin->w_cursor;  //new insertion starts here
+    if (Insstart.col > Insstart_orig.col && !ins_need_undo) {
+      // Don't update the original insert position when moved to the
+      // right, except when nothing was inserted yet.
+      update_Insstart_orig = FALSE;
+    }
+    Insstart_textlen = (colnr_T)linetabsize(get_cursor_line_ptr());
+
     if (u_save_cursor() == OK) {
       arrow_used = FALSE;
       ins_need_undo = FALSE;
     }
-    Insstart = curwin->w_cursor;        /* new insertion starts here */
-    Insstart_textlen = (colnr_T)linetabsize(get_cursor_line_ptr());
     ai_col = 0;
     if (State & VREPLACE_FLAG) {
       orig_line_count = curbuf->b_ml.ml_line_count;
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 0dd261f53a..0ae96365b2 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -5403,11 +5403,9 @@ static int list_join(garray_T *gap, list_T *l, char_u *sep, int echo_style, int
 int garbage_collect(void)
 {
   int copyID;
-  win_T       *wp;
   funccall_T  *fc, **pfc;
   int did_free;
   int did_free_funccal = FALSE;
-  tabpage_T   *tp;
 
   /* Only do this once. */
   want_garbage_collect = FALSE;
@@ -5442,14 +5440,16 @@ int garbage_collect(void)
   }
 
   /* window-local variables */
-  FOR_ALL_TAB_WINDOWS(tp, wp)
-  set_ref_in_item(&wp->w_winvar.di_tv, copyID);
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    set_ref_in_item(&wp->w_winvar.di_tv, copyID);
+  }
   if (aucmd_win != NULL)
     set_ref_in_item(&aucmd_win->w_winvar.di_tv, copyID);
 
   /* tabpage-local variables */
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+  FOR_ALL_TABS(tp) {
     set_ref_in_item(&tp->tp_winvar.di_tv, copyID);
+  }
 
   /* global variables */
   set_ref_in_ht(&globvarht, copyID);
@@ -9588,21 +9588,27 @@ find_win_by_nr (
     tabpage_T *tp         /* NULL for current tab page */
 )
 {
-  win_T       *wp;
-  int nr;
-
-  nr = get_tv_number_chk(vp, NULL);
+  int nr = get_tv_number_chk(vp, NULL);
 
-  if (nr < 0)
+  if (nr < 0) {
     return NULL;
-  if (nr == 0)
+  }
+
+  if (nr == 0) {
     return curwin;
+  }
 
-  for (wp = (tp == NULL || tp == curtab) ? firstwin : tp->tp_firstwin;
-       wp != NULL; wp = wp->w_next)
-    if (--nr <= 0)
-      break;
-  return wp;
+  // This method accepts NULL as an alias for curtab.
+  if (tp == NULL) {
+     tp = curtab;
+  }
+
+  FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+    if (--nr <= 0) {
+      return wp;
+    }
+  }
+  return NULL;
 }
 
 /*
@@ -13455,15 +13461,36 @@ static int item_compare(const void *s1, const void *s2)
 {
   sortItem_T  *si1, *si2;
   char_u      *p1, *p2;
-  char_u      *tofree1, *tofree2;
+  char_u      *tofree1 = NULL, *tofree2 = NULL;
   int res;
   char_u numbuf1[NUMBUFLEN];
   char_u numbuf2[NUMBUFLEN];
 
   si1 = (sortItem_T *)s1;
   si2 = (sortItem_T *)s2;
-  p1 = tv2string(&si1->item->li_tv, &tofree1, numbuf1, 0);
-  p2 = tv2string(&si2->item->li_tv, &tofree2, numbuf2, 0);
+  typval_T *tv1 = &si1->item->li_tv;
+  typval_T *tv2 = &si2->item->li_tv;
+  // tv2string() puts quotes around a string and allocates memory.  Don't do
+  // that for string variables. Use a single quote when comparing with a
+  // non-string to do what the docs promise.
+  if (tv1->v_type == VAR_STRING) {
+    if (tv2->v_type != VAR_STRING || item_compare_numeric) {
+      p1 = (char_u *)"'";
+    } else {
+      p1 = tv1->vval.v_string;
+    }
+  } else {
+    p1 = tv2string(tv1, &tofree1, numbuf1, 0);
+  }
+  if (tv2->v_type == VAR_STRING) {
+    if (tv1->v_type != VAR_STRING || item_compare_numeric) {
+      p2 = (char_u *)"'";
+    } else {
+      p2 = tv2->vval.v_string;
+    }
+  } else {
+    p2 = tv2string(tv2, &tofree2, numbuf2, 0);
+  }
   if (p1 == NULL)
     p1 = (char_u *)"";
   if (p2 == NULL)
@@ -13481,8 +13508,8 @@ static int item_compare(const void *s1, const void *s2)
     res = n1 == n2 ? 0 : n1 > n2 ? 1 : -1;
   }
 
-  // When the result would be zero, compare the pointers themselves.  Makes
-  // the sort stable.
+  // When the result would be zero, compare the item indexes.  Makes the
+  // sort stable.
   if (res == 0 && !item_compare_keep_zero) {
     res = si1->idx > si2->idx ? 1 : -1;
   }
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 163d20f13a..44604b68c4 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -2962,13 +2962,10 @@ do_ecmd (
 
     /* It's possible that all lines in the buffer changed.  Need to update
      * automatic folding for all windows where it's used. */
-    {
-      win_T           *win;
-      tabpage_T       *tp;
-
-      FOR_ALL_TAB_WINDOWS(tp, win)
-      if (win->w_buffer == curbuf)
+    FOR_ALL_TAB_WINDOWS(tp, win) {
+      if (win->w_buffer == curbuf) {
         foldUpdateAll(win);
+      }
     }
 
     /* Change directories when the 'acd' option is set. */
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index c3d34e9991..0703c76b8a 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -1204,7 +1204,6 @@ check_changed_any (
   int bufnum = 0;
   int bufcount = 0;
   int         *bufnrs;
-  tabpage_T   *tp;
 
   FOR_ALL_BUFFERS(buf) {
     ++bufcount;
@@ -1225,9 +1224,9 @@ check_changed_any (
   }
 
   /* buf in other tab */
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+  FOR_ALL_TABS(tp) {
     if (tp != curtab) {
-      for (win_T *wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next) {
+      FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
         add_bufnum(bufnrs, &bufnum, wp->w_buffer->b_fnum);
       }
     }
@@ -1282,7 +1281,6 @@ check_changed_any (
 
   /* Try to find a window that contains the buffer. */
   if (buf != curbuf) {
-    win_T *wp;
     FOR_ALL_TAB_WINDOWS(tp, wp) {
       if (wp->w_buffer == buf) {
         goto_tabpage_win(tp, wp);
@@ -1510,12 +1508,11 @@ do_arglist (
  */
 static void alist_check_arg_idx(void)
 {
-  win_T       *win;
-  tabpage_T   *tp;
-
-  FOR_ALL_TAB_WINDOWS(tp, win)
-  if (win->w_alist == curwin->w_alist)
-    check_arg_idx(win);
+  FOR_ALL_TAB_WINDOWS(tp, win) {
+    if (win->w_alist == curwin->w_alist) {
+      check_arg_idx(win);
+    }
+  }
 }
 
 /*
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 1117b6fbcf..7fb109403e 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -5267,9 +5267,6 @@ static void ex_tabclose(exarg_T *eap)
  */
 static void ex_tabonly(exarg_T *eap)
 {
-  tabpage_T   *tp;
-  int done;
-
   if (cmdwin_type != 0)
     cmdwin_result = K_IGNORE;
   else if (first_tabpage->tp_next == NULL)
@@ -5277,8 +5274,8 @@ static void ex_tabonly(exarg_T *eap)
   else {
     /* Repeat this up to a 1000 times, because autocommands may mess
      * up the lists. */
-    for (done = 0; done < 1000; ++done) {
-      for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+    for (int done = 0; done < 1000; ++done) {
+      FOR_ALL_TABS(tp) {
         if (tp->tp_topframe != topframe) {
           tabpage_close_other(tp, eap->forceit);
           /* if we failed to close it quit */
@@ -5287,8 +5284,10 @@ static void ex_tabonly(exarg_T *eap)
           /* start over, "tp" is now invalid */
           break;
         }
-      if (first_tabpage->tp_next == NULL)
+      }
+      if (first_tabpage->tp_next == NULL) {
         break;
+      }
     }
   }
 }
@@ -5607,18 +5606,21 @@ alist_add (
  */
 void alist_slash_adjust(void)
 {
-  int i;
-  win_T       *wp;
-  tabpage_T   *tp;
-
-  for (i = 0; i < GARGCOUNT; ++i)
-    if (GARGLIST[i].ae_fname != NULL)
+  for (int i = 0; i < GARGCOUNT; ++i) {
+    if (GARGLIST[i].ae_fname != NULL) {
       slash_adjust(GARGLIST[i].ae_fname);
-  FOR_ALL_TAB_WINDOWS(tp, wp)
-  if (wp->w_alist != &global_alist)
-    for (i = 0; i < WARGCOUNT(wp); ++i)
-      if (WARGLIST(wp)[i].ae_fname != NULL)
-        slash_adjust(WARGLIST(wp)[i].ae_fname);
+    }
+  }
+
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    if (wp->w_alist != &global_alist) {
+      for (int i = 0; i < WARGCOUNT(wp); ++i) {
+        if (WARGLIST(wp)[i].ae_fname != NULL) {
+          slash_adjust(WARGLIST(wp)[i].ae_fname);
+        }
+      }
+    }
+  }
 }
 
 #endif
@@ -5808,24 +5810,27 @@ static void ex_tabmove(exarg_T *eap)
  */
 static void ex_tabs(exarg_T *eap)
 {
-  tabpage_T   *tp;
-  win_T       *wp;
   int tabcount = 1;
 
   msg_start();
   msg_scroll = TRUE;
-  for (tp = first_tabpage; tp != NULL && !got_int; tp = tp->tp_next) {
+
+  FOR_ALL_TABS(tp) {
+    if (got_int) {
+       break;
+    }
+
     msg_putchar('\n');
     vim_snprintf((char *)IObuff, IOSIZE, _("Tab page %d"), tabcount++);
     msg_outtrans_attr(IObuff, hl_attr(HLF_T));
     out_flush();            /* output one line at a time */
     ui_breakcheck();
 
-    if (tp  == curtab)
-      wp = firstwin;
-    else
-      wp = tp->tp_firstwin;
-    for (; wp != NULL && !got_int; wp = wp->w_next) {
+    FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+      if (got_int) {
+        break;
+      }
+
       msg_putchar('\n');
       msg_putchar(wp == curwin ? '>' : ' ');
       msg_putchar(' ');
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 72dd7170ce..fbce4428db 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -5102,16 +5102,15 @@ void buf_reload(buf_T *buf, int orig_mode)
   check_cursor();
   update_topline();
   keep_filetype = FALSE;
-  {
-    win_T       *wp;
-    tabpage_T   *tp;
 
-    /* Update folds unless they are defined manually. */
-    FOR_ALL_TAB_WINDOWS(tp, wp)
+  /* Update folds unless they are defined manually. */
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
     if (wp->w_buffer == curwin->w_buffer
-        && !foldmethodIsManual(wp))
+        && !foldmethodIsManual(wp)) {
       foldUpdateAll(wp);
+    }
   }
+
   /* If the mode didn't change and 'readonly' was set, keep the old
    * value; the user probably used the ":view" command.  But don't
    * reset it, might have had a read error. */
@@ -6269,14 +6268,11 @@ aucmd_restbuf (
      * page. Do not trigger autocommands here. */
     block_autocmds();
     if (curwin != aucmd_win) {
-      tabpage_T   *tp;
-      win_T       *wp;
-
-      FOR_ALL_TAB_WINDOWS(tp, wp)
-      {
+      FOR_ALL_TAB_WINDOWS(tp, wp) {
         if (wp == aucmd_win) {
-          if (tp != curtab)
+          if (tp != curtab) {
             goto_tabpage_tp(tp, TRUE, TRUE);
+          }
           win_goto(aucmd_win);
           goto win_found;
         }
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index efad3c3af1..2025295c11 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -521,15 +521,19 @@ EXTERN win_T    *firstwin;              /* first window */
 EXTERN win_T    *lastwin;               /* last window */
 EXTERN win_T    *prevwin INIT(= NULL);  /* previous window */
 # define W_NEXT(wp) ((wp)->w_next)
-# define FOR_ALL_WINDOWS(wp) for (win_T *wp = firstwin; wp != NULL; wp = wp->w_next)
+# define FOR_ALL_WINDOWS(wp) \
+   FOR_ALL_WINDOWS_IN_TAB(wp, curtab)
 /*
  * When using this macro "break" only breaks out of the inner loop. Use "goto"
  * to break out of the tabpage loop.
  */
 # define FOR_ALL_TAB_WINDOWS(tp, wp) \
-  for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
-    for ((wp) = ((tp) == curtab) \
-                ? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
+  FOR_ALL_TABS(tp) \
+    FOR_ALL_WINDOWS_IN_TAB(wp, tp)
+
+# define FOR_ALL_WINDOWS_IN_TAB(wp, tp) \
+  for (win_T *wp = ((tp) == curtab) \
+              ? firstwin : (tp)->tp_firstwin; wp != NULL; wp = wp->w_next)
 
 EXTERN win_T    *curwin;        /* currently active window */
 
@@ -550,6 +554,9 @@ EXTERN tabpage_T    *first_tabpage;
 EXTERN tabpage_T    *curtab;
 EXTERN int redraw_tabline INIT(= FALSE);           /* need to redraw tabline */
 
+// Iterates over all tabs in the tab list
+# define FOR_ALL_TABS(tp) for (tabpage_T *tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+
 /*
  * All buffers are linked in a list. 'firstbuf' points to the first entry,
  * 'lastbuf' to the last entry and 'curbuf' to the currently active buffer.
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 7dc299e73b..e3f1d88dff 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -758,7 +758,6 @@ main_loop (
 /* Exit properly */
 void getout(int exitval)
 {
-  win_T       *wp;
   tabpage_T   *tp, *next_tp;
 
   exiting = TRUE;
@@ -780,11 +779,12 @@ void getout(int exitval)
     /* Trigger BufWinLeave for all windows, but only once per buffer. */
     for (tp = first_tabpage; tp != NULL; tp = next_tp) {
       next_tp = tp->tp_next;
-      for (wp = (tp == curtab)
-          ? firstwin : tp->tp_firstwin; wp != NULL; wp = wp->w_next) {
-        if (wp->w_buffer == NULL)
+      FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+        if (wp->w_buffer == NULL) {
           /* Autocmd must have close the buffer already, skip. */
           continue;
+        }
+
         buf_T *buf = wp->w_buffer;
         if (buf->b_changedtick != -1) {
           apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname,
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 6339cf8275..a66bf43c13 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -898,8 +898,6 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
   int i;
   int fnum = curbuf->b_fnum;
   linenr_T    *lp;
-  win_T       *win;
-  tabpage_T   *tab;
   static pos_T initpos = INIT_POS_T(1, 0, 0);
 
   if (line2 < line1 && amount_after == 0L)          /* nothing to do */
@@ -939,8 +937,9 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
     /* quickfix marks */
     qf_mark_adjust(NULL, line1, line2, amount, amount_after);
     /* location lists */
-    FOR_ALL_TAB_WINDOWS(tab, win)
-        qf_mark_adjust(win, line1, line2, amount, amount_after);
+    FOR_ALL_TAB_WINDOWS(tab, win) {
+      qf_mark_adjust(win, line1, line2, amount, amount_after);
+    }
 
     sign_mark_adjust(line1, line2, amount, amount_after);
   }
@@ -958,21 +957,26 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
   /*
    * Adjust items in all windows related to the current buffer.
    */
-  FOR_ALL_TAB_WINDOWS(tab, win)
-  {
-    if (!cmdmod.lockmarks)
+  FOR_ALL_TAB_WINDOWS(tab, win) {
+    if (!cmdmod.lockmarks) {
       /* Marks in the jumplist.  When deleting lines, this may create
        * duplicate marks in the jumplist, they will be removed later. */
-      for (i = 0; i < win->w_jumplistlen; ++i)
-        if (win->w_jumplist[i].fmark.fnum == fnum)
+      for (i = 0; i < win->w_jumplistlen; ++i) {
+        if (win->w_jumplist[i].fmark.fnum == fnum) {
           one_adjust_nodel(&(win->w_jumplist[i].fmark.mark.lnum));
+        }
+      }
+    }
 
     if (win->w_buffer == curbuf) {
-      if (!cmdmod.lockmarks)
+      if (!cmdmod.lockmarks) {
         /* marks in the tag stack */
-        for (i = 0; i < win->w_tagstacklen; i++)
-          if (win->w_tagstack[i].fmark.fnum == fnum)
+        for (i = 0; i < win->w_tagstacklen; i++) {
+          if (win->w_tagstack[i].fmark.fnum == fnum) {
             one_adjust_nodel(&(win->w_tagstack[i].fmark.mark.lnum));
+          }
+        }
+      }
 
       /* the displayed Visual area */
       if (win->w_old_cursor_lnum != 0) {
@@ -985,12 +989,14 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
       if (win != curwin) {
         if (win->w_topline >= line1 && win->w_topline <= line2) {
           if (amount == MAXLNUM) {                  /* topline is deleted */
-            if (line1 <= 1)
+            if (line1 <= 1) {
               win->w_topline = 1;
-            else
+            } else {
               win->w_topline = line1 - 1;
-          } else                        /* keep topline on the same line */
+            }
+          } else {                      /* keep topline on the same line */
             win->w_topline += amount;
+          }
           win->w_topfill = 0;
         } else if (amount_after && win->w_topline > line2) {
           win->w_topline += amount_after;
@@ -998,15 +1004,18 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
         }
         if (win->w_cursor.lnum >= line1 && win->w_cursor.lnum <= line2) {
           if (amount == MAXLNUM) {         /* line with cursor is deleted */
-            if (line1 <= 1)
+            if (line1 <= 1) {
               win->w_cursor.lnum = 1;
-            else
+            } else {
               win->w_cursor.lnum = line1 - 1;
+            }
             win->w_cursor.col = 0;
-          } else                        /* keep cursor on the same line */
+          } else {                      /* keep cursor on the same line */
             win->w_cursor.lnum += amount;
-        } else if (amount_after && win->w_cursor.lnum > line2)
+          }
+        } else if (amount_after && win->w_cursor.lnum > line2) {
           win->w_cursor.lnum += amount_after;
+        }
       }
 
       /* adjust folds */
@@ -1338,12 +1347,6 @@ int removable(char_u *name)
  */
 int write_viminfo_marks(FILE *fp_out)
 {
-  int count;
-  int is_mark_set;
-  int i;
-  win_T       *win;
-  tabpage_T   *tp;
-
   /*
    * Set b_last_cursor for the all buffers that have a window.
    */
@@ -1352,22 +1355,22 @@ int write_viminfo_marks(FILE *fp_out)
   }
 
   fputs(_("\n# History of marks within files (newest to oldest):\n"), fp_out);
-  count = 0;
+  int count = 0;
   FOR_ALL_BUFFERS(buf) {
     /*
      * Only write something if buffer has been loaded and at least one
      * mark is set.
      */
     if (buf->b_marks_read) {
-      if (buf->b_last_cursor.lnum != 0)
-        is_mark_set = TRUE;
-      else {
-        is_mark_set = FALSE;
-        for (i = 0; i < NMARKS; i++)
+      bool is_mark_set = true;
+      if (buf->b_last_cursor.lnum == 0) {
+        is_mark_set = false;
+        for (int i = 0; i < NMARKS; i++) {
           if (buf->b_namedm[i].lnum != 0) {
-            is_mark_set = TRUE;
+            is_mark_set = true;
             break;
           }
+        }
       }
       if (is_mark_set && buf->b_ffname != NULL
           && buf->b_ffname[0] != NUL && !removable(buf->b_ffname)) {
@@ -1378,10 +1381,12 @@ int write_viminfo_marks(FILE *fp_out)
         write_one_mark(fp_out, '^', &buf->b_last_insert);
         write_one_mark(fp_out, '.', &buf->b_last_change);
         /* changelist positions are stored oldest first */
-        for (i = 0; i < buf->b_changelistlen; ++i)
+        for (int i = 0; i < buf->b_changelistlen; ++i) {
           write_one_mark(fp_out, '+', &buf->b_changelist[i]);
-        for (i = 0; i < NMARKS; i++)
+        }
+        for (int i = 0; i < NMARKS; i++) {
           write_one_mark(fp_out, 'a' + i, &buf->b_namedm[i]);
+        }
         count++;
       }
     }
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 1c3d6e372c..f4dffb0bcd 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -452,13 +452,9 @@ void free_all_mem(void)
   p_hi = 0;
   init_history();
 
-  {
-    win_T       *win;
-    tabpage_T   *tab;
-
-    qf_free_all(NULL);
-    /* Free all location lists */
-    FOR_ALL_TAB_WINDOWS(tab, win)
+  qf_free_all(NULL);
+  /* Free all location lists */
+  FOR_ALL_TAB_WINDOWS(tab, win) {
     qf_free_all(win);
   }
 
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index d7e9618639..52780b9a57 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -2027,8 +2027,6 @@ changed_lines_buf (
  */
 static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra)
 {
-  win_T       *wp;
-  tabpage_T   *tp;
   int i;
   int cols;
   pos_T       *p;
@@ -2072,21 +2070,21 @@ static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra
           curbuf->b_changelistlen = JUMPLISTSIZE - 1;
           memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
               sizeof(pos_T) * (JUMPLISTSIZE - 1));
-          FOR_ALL_TAB_WINDOWS(tp, wp)
-          {
+          FOR_ALL_TAB_WINDOWS(tp, wp) {
             /* Correct position in changelist for other windows on
              * this buffer. */
-            if (wp->w_buffer == curbuf && wp->w_changelistidx > 0)
+            if (wp->w_buffer == curbuf && wp->w_changelistidx > 0) {
               --wp->w_changelistidx;
+            }
           }
         }
-        FOR_ALL_TAB_WINDOWS(tp, wp)
-        {
+        FOR_ALL_TAB_WINDOWS(tp, wp) {
           /* For other windows, if the position in the changelist is
            * at the end it stays at the end. */
           if (wp->w_buffer == curbuf
-              && wp->w_changelistidx == curbuf->b_changelistlen)
+              && wp->w_changelistidx == curbuf->b_changelistlen) {
             ++wp->w_changelistidx;
+          }
         }
         ++curbuf->b_changelistlen;
       }
@@ -2098,8 +2096,7 @@ static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra
     curwin->w_changelistidx = curbuf->b_changelistlen;
   }
 
-  FOR_ALL_TAB_WINDOWS(tp, wp)
-  {
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
     if (wp->w_buffer == curbuf) {
       /* Mark this window to be redrawn later. */
       if (wp->w_redr_type < VALID)
diff --git a/src/nvim/option.c b/src/nvim/option.c
index b26b6ed4cc..96265681df 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -2210,17 +2210,16 @@ set_options_default (
     int opt_flags                  /* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
 )
 {
-  int i;
-  win_T       *wp;
-  tabpage_T   *tp;
-
-  for (i = 0; !istermoption(&options[i]); i++)
-    if (!(options[i].flags & P_NODEFAULT))
+  for (int i = 0; !istermoption(&options[i]); i++) {
+    if (!(options[i].flags & P_NODEFAULT)) {
       set_option_default(i, opt_flags, p_cp);
+    }
+  }
 
   /* The 'scroll' option must be computed for all windows. */
-  FOR_ALL_TAB_WINDOWS(tp, wp)
-  win_comp_scroll(wp);
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    win_comp_scroll(wp);
+  }
 }
 
 /// Set the Vi-default value of a string option.
@@ -5532,13 +5531,11 @@ set_num_option (
       errmsg = e_positive;
       curbuf->b_p_tw = 0;
     }
-    {
-      win_T       *wp;
-      tabpage_T   *tp;
 
-      FOR_ALL_TAB_WINDOWS(tp, wp)
+    FOR_ALL_TAB_WINDOWS(tp, wp) {
       check_colorcolumn(wp);
     }
+
   }
 
   /*
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 4a9c97dc20..0ed39e8c49 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -71,7 +71,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG AND
           -P ${CMAKE_MODULE_PATH}/RunMsgfmt.cmake
       DEPENDS ${poFile} ${NVIM_POT})
 
-    install(
+    install_helper(
       FILES ${moFile}
       DESTINATION share/locale/${name}/LC_MESSAGES
       RENAME nvim.mo)
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 3bc70b6b41..b2a6b01d96 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -1466,11 +1466,7 @@ void qf_jump(qf_info_T *qi, int dir, int errornr, int forceit)
      * then search in other tabs.
      */
     if (!usable_win && (swb_flags & SWB_USETAB)) {
-      tabpage_T   *tp;
-      win_T       *wp;
-
-      FOR_ALL_TAB_WINDOWS(tp, wp)
-      {
+      FOR_ALL_TAB_WINDOWS(tp, wp) {
         if (wp->w_buffer->b_fnum == qf_ptr->qf_fnum) {
           goto_tabpage_win(tp, wp);
           usable_win = true;
@@ -2236,12 +2232,11 @@ static win_T *qf_find_win(qf_info_T *qi)
  */
 static buf_T *qf_find_buf(qf_info_T *qi)
 {
-  tabpage_T   *tp;
-  win_T       *win;
-
-  FOR_ALL_TAB_WINDOWS(tp, win)
-  if (is_qf_win(win, qi))
-    return win->w_buffer;
+  FOR_ALL_TAB_WINDOWS(tp, win) {
+    if (is_qf_win(win, qi)) {
+      return win->w_buffer;
+    }
+  }
 
   return NULL;
 }
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 193c68860d..90da02bb1b 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2790,17 +2790,29 @@ static int peekchr(void)
        * either "\|", "\)", "\&", or "\n" */
       if (reg_magic >= MAGIC_OFF) {
         char_u *p = regparse + 1;
+        bool is_magic_all = (reg_magic == MAGIC_ALL);
 
-        /* ignore \c \C \m and \M after '$' */
+        // ignore \c \C \m \M \v \V and \Z after '$'
         while (p[0] == '\\' && (p[1] == 'c' || p[1] == 'C'
-                                || p[1] == 'm' || p[1] == 'M' || p[1] == 'Z'))
+                                || p[1] == 'm' || p[1] == 'M'
+                                || p[1] == 'v' || p[1] == 'V'
+                                || p[1] == 'Z')) {
+          if (p[1] == 'v') {
+            is_magic_all = true;
+          } else if (p[1] == 'm' || p[1] == 'M' || p[1] == 'V') {
+            is_magic_all = false;
+          }
           p += 2;
+        }
         if (p[0] == NUL
             || (p[0] == '\\'
                 && (p[1] == '|' || p[1] == '&' || p[1] == ')'
                     || p[1] == 'n'))
-            || reg_magic == MAGIC_ALL)
+            || (is_magic_all
+                && (p[0] == '|' || p[0] == '&' || p[0] == ')'))
+            || reg_magic == MAGIC_ALL) {
           curchr = Magic('$');
+        }
       }
       break;
     case '\\':
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 122c23ed84..c46b5fa48c 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -346,7 +346,7 @@ int redraw_asap(int type)
  * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot
  * may become invalid and the whole window will have to be redrawn.
  */
-void 
+void
 redrawWinline (
     linenr_T lnum,
     int invalid             /* window line height is invalid now */
@@ -2114,7 +2114,7 @@ static void copy_text_attr(int off, char_u *buf, int len, int attr)
  * Fill the foldcolumn at "p" for window "wp".
  * Only to be called when 'foldcolumn' > 0.
  */
-static void 
+static void
 fill_foldcolumn (
     char_u *p,
     win_T *wp,
@@ -2166,7 +2166,7 @@ fill_foldcolumn (
  *
  * Return the number of last row the line occupies.
  */
-static int 
+static int
 win_line (
     win_T *wp,
     linenr_T lnum,
@@ -2655,8 +2655,8 @@ win_line (
     }
     next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
 
-    // Need to get the line again, a multi-line regexp may have made it 
-    // invalid. 
+    // Need to get the line again, a multi-line regexp may have made it
+    // invalid.
     line = ml_get_buf(wp->w_buffer, lnum, false);
     ptr = line + v;
 
@@ -2672,7 +2672,7 @@ win_line (
       } else {
           shl->endcol = MAXCOL;
       }
-      // Highlight one character for an empty match. 
+      // Highlight one character for an empty match.
       if (shl->startcol == shl->endcol) {
           if (has_mbyte && line[shl->endcol] != NUL) {
               shl->endcol += (*mb_ptr2len)(line + shl->endcol);
@@ -2680,7 +2680,7 @@ win_line (
               ++shl->endcol;
           }
       }
-      if ((long)shl->startcol < v) {   // match at leftcol 
+      if ((long)shl->startcol < v) {   // match at leftcol
         shl->attr_cur = shl->attr;
         search_attr = shl->attr;
       }
@@ -2830,9 +2830,12 @@ win_line (
         if (wp->w_p_bri && n_extra == 0 && row != startrow && filler_lines == 0) {
           char_attr = 0; // was: hl_attr(HLF_AT);
 
-          if (diff_hlf != (hlf_T)0)
+          if (diff_hlf != (hlf_T)0) {
             char_attr = hl_attr(diff_hlf);
-
+            if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
+              char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUL));
+            }
+          }
           p_extra = NULL;
           c_extra = ' ';
           n_extra = get_breakindent_win(wp, ml_get_buf(wp->w_buffer, lnum, FALSE));
@@ -2869,8 +2872,9 @@ win_line (
           if (tocol == vcol)
             tocol += n_extra;
           /* combine 'showbreak' with 'cursorline' */
-          if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
-            char_attr = hl_combine_attr(char_attr, HLF_CLN);
+          if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
+            char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUL));
+          }
         }
       }
 
@@ -2948,7 +2952,7 @@ win_line (
                 && v >= (long)shl->startcol
                 && v < (long)shl->endcol) {
               shl->attr_cur = shl->attr;
-            } else if (v >= (long)shl->endcol) {
+            } else if (v >= (long)shl->endcol && shl->lnum == lnum) {
               shl->attr_cur = 0;
 
               next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
@@ -3016,6 +3020,9 @@ win_line (
             && n_extra == 0)
           diff_hlf = HLF_CHD;                   /* changed line */
         line_attr = hl_attr(diff_hlf);
+        if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
+          line_attr = hl_combine_attr(line_attr, hl_attr(HLF_CUL));
+        }
       }
 
       /* Decide which of the highlight attributes to use. */
@@ -3620,8 +3627,12 @@ win_line (
             char_attr = line_attr;
           if (diff_hlf == HLF_TXD) {
             diff_hlf = HLF_CHD;
-            if (attr == 0 || char_attr != attr)
+            if (attr == 0 || char_attr != attr) {
               char_attr = hl_attr(diff_hlf);
+              if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
+                char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUL));
+              }
+            }
           }
         }
       }
@@ -4676,7 +4687,7 @@ static int skip_status_match_char(expand_T *xp, char_u *s)
  *
  * If inversion is possible we use it. Else '=' characters are used.
  */
-void 
+void
 win_redr_status_matches (
     expand_T *xp,
     int num_matches,
@@ -4962,7 +4973,7 @@ void win_redr_status(win_T *wp)
       fillchar = fillchar_status(&attr, wp == curwin);
     else
       fillchar = fillchar_vsep(&attr);
-    screen_putchar(fillchar, wp->w_winrow + wp->w_height, 
+    screen_putchar(fillchar, wp->w_winrow + wp->w_height,
                    W_ENDCOL(wp), attr);
   }
   busy = FALSE;
@@ -5024,7 +5035,7 @@ int stl_connected(win_T *wp)
 /*
  * Get the value to show for the language mappings, active 'keymap'.
  */
-int 
+int
 get_keymap_str (
     win_T *wp,
     char_u *buf,           /* buffer for the result */
@@ -5068,7 +5079,7 @@ get_keymap_str (
  * Redraw the status line or ruler of window "wp".
  * When "wp" is NULL redraw the tab pages line from 'tabline'.
  */
-static void 
+static void
 win_redr_custom (
     win_T *wp,
     int draw_ruler                 /* TRUE or FALSE */
@@ -5606,7 +5617,7 @@ static void prepare_search_hl(win_T *wp, linenr_T lnum)
       if (cur != NULL) {
         cur->pos.cur = 0;
       }
-      bool pos_inprogress = true; // mark that a position match search is 
+      bool pos_inprogress = true; // mark that a position match search is
                                   // in progress
       n = 0;
       while (shl->first_lnum < lnum && (shl->rm.regprog != NULL
@@ -5637,7 +5648,7 @@ static void prepare_search_hl(win_T *wp, linenr_T lnum)
  * shl->lnum is zero.
  * Careful: Any pointers for buffer lines will become invalid.
  */
-static void 
+static void
 next_search_hl (
     win_T *win,
     match_T *shl,               /* points to search_hl or a match */
@@ -5705,9 +5716,9 @@ next_search_hl (
     if (shl->rm.regprog != NULL) {
       nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, matchcol, &(shl->tm));
       if (called_emsg || got_int) {
-        // Error while handling regexp: stop using this regexp. 
+        // Error while handling regexp: stop using this regexp.
         if (shl == &search_hl) {
-          // don't free regprog in the match list, it's a copy 
+          // don't free regprog in the match list, it's a copy
           vim_regfree(shl->rm.regprog);
           SET_NO_HLSEARCH(TRUE);
         }
@@ -5735,11 +5746,11 @@ next_search_hl (
 
 static int
 next_search_hl_pos(
-    match_T *shl,         // points to a match 
+    match_T *shl,         // points to a match
     linenr_T lnum,
-    posmatch_T *posmatch, // match positions 
+    posmatch_T *posmatch, // match positions
     colnr_T mincol        // minimal column for a match
-) 
+)
 {
   int i;
   int bot = -1;
@@ -5754,8 +5765,8 @@ next_search_hl_pos(
     }
     if (posmatch->pos[i].lnum == lnum) {
       if (shl->lnum == lnum) {
-        // partially sort positions by column numbers 
-        // on the same line 
+        // partially sort positions by column numbers
+        // on the same line
         if (posmatch->pos[i].col < posmatch->pos[bot].col) {
           llpos_T tmp = posmatch->pos[i];
 
@@ -5772,7 +5783,7 @@ next_search_hl_pos(
   if (shl->lnum == lnum) {
     colnr_T start = posmatch->pos[bot].col == 0
                     ? 0: posmatch->pos[bot].col - 1;
-    colnr_T end = posmatch->pos[bot].col == 0 
+    colnr_T end = posmatch->pos[bot].col == 0
                   ? MAXCOL : start + posmatch->pos[bot].len;
 
     shl->rm.startpos[0].lnum = 0;
@@ -6263,7 +6274,6 @@ int screen_valid(int doclear)
 void screenalloc(bool doclear)
 {
   int new_row, old_row;
-  win_T           *wp;
   int outofmem = FALSE;
   int len;
   schar_T         *new_ScreenLines;
@@ -6275,7 +6285,6 @@ void screenalloc(bool doclear)
   unsigned        *new_LineOffset;
   char_u          *new_LineWraps;
   short           *new_TabPageIdxs;
-  tabpage_T       *tp;
   static int entered = FALSE;                   /* avoid recursiveness */
   static int done_outofmem_msg = FALSE;         /* did outofmem message */
   int retry_count = 0;
@@ -6328,8 +6337,9 @@ retry:
    * Continuing with the old ScreenLines may result in a crash, because the
    * size is wrong.
    */
-  FOR_ALL_TAB_WINDOWS(tp, wp)
-  win_free_lsize(wp);
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    win_free_lsize(wp);
+  }
   if (aucmd_win != NULL)
     win_free_lsize(aucmd_win);
 
@@ -6349,8 +6359,7 @@ retry:
   new_LineWraps = xmalloc((size_t)(Rows * sizeof(char_u)));
   new_TabPageIdxs = xmalloc((size_t)(Columns * sizeof(short)));
 
-  FOR_ALL_TAB_WINDOWS(tp, wp)
-  {
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
     win_alloc_lines(wp);
   }
   if (aucmd_win != NULL && aucmd_win->w_lines == NULL) {
@@ -7093,7 +7102,7 @@ static void win_rest_invalid(win_T *wp)
  *
  * return FAIL for failure, OK for success.
  */
-int 
+int
 screen_ins_lines (
     int off,
     int row,
@@ -7266,7 +7275,7 @@ screen_ins_lines (
  *
  * Return OK for success, FAIL if the lines are not deleted.
  */
-int 
+int
 screen_del_lines (
     int off,
     int row,
@@ -7632,8 +7641,7 @@ void unshowmode(int force)
 static void draw_tabline(void)
 {
   int tabcount = 0;
-  tabpage_T   *tp;
-  int tabwidth;
+  int tabwidth = 0;
   int col = 0;
   int scol = 0;
   int attr;
@@ -7675,18 +7683,27 @@ static void draw_tabline(void)
           (char_u *)"", OPT_FREE, SID_ERROR);
     called_emsg |= save_called_emsg;
   } else {
-    for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+    FOR_ALL_TABS(tp) {
       ++tabcount;
+    }
 
-    tabwidth = (Columns - 1 + tabcount / 2) / tabcount;
-    if (tabwidth < 6)
+    if (tabcount > 0) {
+      tabwidth = (Columns - 1 + tabcount / 2) / tabcount;
+    }
+
+    if (tabwidth < 6) {
       tabwidth = 6;
+    }
 
     attr = attr_nosel;
     tabcount = 0;
     scol = 0;
-    for (tp = first_tabpage; tp != NULL && col < Columns - 4;
-         tp = tp->tp_next) {
+
+    FOR_ALL_TABS(tp) {
+      if (col >= Columns - 4) {
+        break;
+      }
+
       scol = col;
 
       if (tp->tp_topframe == topframe)
@@ -7718,8 +7735,7 @@ static void draw_tabline(void)
           if (col + len >= Columns - 3)
             break;
           screen_puts_len(NameBuff, len, 0, col,
-              hl_combine_attr(attr, hl_attr(HLF_T))
-              );
+                          hl_combine_attr(attr, hl_attr(HLF_T)));
           col += len;
         }
         if (modified)
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 81dc49e800..9f04f880b5 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -33,6 +33,7 @@ SCRIPTS := test_autoformat_join.out                                    \
            test106.out test107.out                                     \
            test_options.out                                            \
            test_listlbr.out test_listlbr_utf8.out                      \
+           test_changelist.out                                         \
            test_breakindent.out                                        \
            test_insertcount.out
 
diff --git a/src/nvim/testdir/test39.in b/src/nvim/testdir/test39.in
index c1e1cc49a6..7d1c672522 100644
--- a/src/nvim/testdir/test39.in
+++ b/src/nvim/testdir/test39.in
@@ -23,6 +23,9 @@ G$khhhhhkkcmno
 /^aaaa/
 :exe ":norm! l\<C-V>jjjlllI\<Right>\<Right>  \<Esc>"
 :/^aa/,/^$/w >> test.out
+/xaaa$/
+:exe ":norm! \<C-V>jjjI<>\<Left>p\<Esc>"
+:/xaaa$/,/^$/w >> test.out
 :" Test for Visual block was created with the last <C-v>$
 /^A23$/
 :exe ":norm! l\<C-V>j$Aab\<Esc>"
@@ -77,6 +80,11 @@ bbbbbb
 cccccc
 dddddd
 
+xaaa
+bbbb
+cccc
+dddd
+
 A23
 4567
 
diff --git a/src/nvim/testdir/test39.ok b/src/nvim/testdir/test39.ok
index ef7a2c6442..d8e901563a 100644
--- a/src/nvim/testdir/test39.ok
+++ b/src/nvim/testdir/test39.ok
diff --git a/src/nvim/testdir/test63.in b/src/nvim/testdir/test63.in
index ea66ee6dea..ff05afbf81 100644
--- a/src/nvim/testdir/test63.in
+++ b/src/nvim/testdir/test63.in
@@ -3,6 +3,7 @@ Test for ":match", ":2match", ":3match", "clearmatches()", "getmatches()",
 
 STARTTEST
 :so small.vim
+:set encoding=utf8
 :" --- Check that "matcharg()" returns the correct group and pattern if a match
 :" --- is defined.
 :let @r = "*** Test 1: "
@@ -164,7 +165,27 @@ STARTTEST
 :if v1 != v5 && v6 == v1 && v8 == v5 && v10 == v5 && v11 == v1
 :  let @r .= "OK\n"
 :else
-:  let @r .= "FAILED\n"
+:  let @r .= "FAILED: " . v5 . "/" . v6 . "/" . v8 . "/" . v10 . "/" . v11 . "\n"
+:endif
+:call clearmatches()
+:"
+:call setline(1, 'abcdΣabcdef')
+:call matchaddpos("MyGroup1", [[1, 4, 2], [1, 9, 2]])
+:1
+:redraw!
+:let v1 = screenattr(1, 1)
+:let v4 = screenattr(1, 4)
+:let v5 = screenattr(1, 5)
+:let v6 = screenattr(1, 6)
+:let v7 = screenattr(1, 7)
+:let v8 = screenattr(1, 8)
+:let v9 = screenattr(1, 9)
+:let v10 = screenattr(1, 10)
+:let @r .= string(getmatches())."\n"
+:if v1 != v4 && v5 == v4 && v6 == v1 && v7 == v1 && v8 == v4 && v9 == v4 && v10 == v1
+:  let @r .= "OK\n"
+:else
+:  let @r .= "FAILED: " . v4 . "/" . v5 . "/" . v6 . "/" . v7 . "/" . v8 . "/" . v9 . "/" . v10 . "\n"
 :endif
 :call clearmatches()
 G"rp
diff --git a/src/nvim/testdir/test63.ok b/src/nvim/testdir/test63.ok
index f804b693ac..5d619395b7 100644
--- a/src/nvim/testdir/test63.ok
+++ b/src/nvim/testdir/test63.ok
@@ -12,3 +12,5 @@ Results of test63:
 *** Test 11:
 [{'group': 'MyGroup1', 'id': 3, 'priority': 10, 'pos1': [1, 5, 1], 'pos2': [1, 8, 3]}]
 OK
+[{'group': 'MyGroup1', 'id': 11, 'priority': 10, 'pos1': [1, 4, 2], 'pos2': [1, 9, 2]}]
+OK
diff --git a/src/nvim/testdir/test_changelist.in b/src/nvim/testdir/test_changelist.in
new file mode 100644
index 0000000000..6c7c4306c3
--- /dev/null
+++ b/src/nvim/testdir/test_changelist.in
@@ -0,0 +1,22 @@
+Test changelist position after splitting window
+Set 'undolevels' to make changelist for sourced file
+
+STARTTEST
+:so small.vim
+Gkylp:set ul=100
+Gylp:set ul=100
+gg
+:vsplit
+:try
+:  normal g;
+:  normal ggVGcpass
+:catch
+:  normal ggVGcfail
+:finally
+:  %w! test.out
+:endtry
+:qa!
+ENDTEST
+
+1
+2
diff --git a/src/nvim/testdir/test_changelist.ok b/src/nvim/testdir/test_changelist.ok
new file mode 100644
index 0000000000..2ae28399f5
--- /dev/null
+++ b/src/nvim/testdir/test_changelist.ok
@@ -0,0 +1 @@
+pass
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 200d34e2fb..bcde020839 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -217,13 +217,13 @@ static int included_patches[] = {
   //414,
   //413 NA
   //412 NA
-  //411,
+  411,
   410,
   //409 NA
   //408,
-  //407,
+  407,
   //406,
-  //405,
+  405,
   //404 NA
   //403 NA
   //402,
@@ -237,12 +237,12 @@ static int included_patches[] = {
   //394,
   //393,
   392,
-  //391,
+  391,
   //390,
   //389,
   388,
   387,
-  //386,
+  386,
   //385,
   //384 NA
   383,
@@ -268,7 +268,7 @@ static int included_patches[] = {
   //363,
   362,
   361,
-  //360,
+  360,
   359,
   358,
   357,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index f41a5d8872..2a6dcf1743 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -948,6 +948,9 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
       p_wh = size;
   }
 
+  // Keep same changelist position in new window.
+  wp->w_changelistidx = oldwin->w_changelistidx;
+
   /*
    * make the new window the current window
    */
@@ -1674,13 +1677,12 @@ close_windows (
     int keep_curwin                    /* don't close "curwin" */
 )
 {
-  win_T       *wp;
   tabpage_T   *tp, *nexttp;
   int h = tabline_height();
 
   ++RedrawingDisabled;
 
-  for (wp = firstwin; wp != NULL && lastwin != firstwin; ) {
+  for (win_T *wp = firstwin; wp != NULL && lastwin != firstwin; ) {
     if (wp->w_buffer == buf && (!keep_curwin || wp != curwin)
         && !(wp->w_closing || wp->w_buffer->b_closing)
         ) {
@@ -1695,8 +1697,8 @@ close_windows (
   /* Also check windows in other tab pages. */
   for (tp = first_tabpage; tp != NULL; tp = nexttp) {
     nexttp = tp->tp_next;
-    if (tp != curtab)
-      for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
+    if (tp != curtab) {
+      FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
         if (wp->w_buffer == buf
             && !(wp->w_closing || wp->w_buffer->b_closing)
             ) {
@@ -1707,6 +1709,8 @@ close_windows (
           nexttp = first_tabpage;
           break;
         }
+      }
+    }
   }
 
   --RedrawingDisabled;
@@ -1963,7 +1967,6 @@ int win_close(win_T *win, int free_buf)
  */
 void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
 {
-  win_T       *wp;
   int dir;
   tabpage_T   *ptp = NULL;
   int free_tp = FALSE;
@@ -1982,10 +1985,18 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
     return;
 
   /* Autocommands may have closed the window already. */
-  for (wp = tp->tp_firstwin; wp != NULL && wp != win; wp = wp->w_next)
-    ;
-  if (wp == NULL)
-    return;
+  {
+    bool found_window = false;
+    FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+      if (wp == win) {
+         found_window = true;
+         break;
+      }
+    }
+    if (!found_window) {
+       return;
+    }
+  }
 
   /* When closing the last window in a tab page remove the tab page. */
   if (tp->tp_firstwin == tp->tp_lastwin) {
@@ -2986,14 +2997,14 @@ int make_tabpages(int maxcount)
 /*
  * Return TRUE when "tpc" points to a valid tab page.
  */
-int valid_tabpage(tabpage_T *tpc)
+bool valid_tabpage(tabpage_T *tpc)
 {
-  tabpage_T   *tp;
-
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
-    if (tp == tpc)
-      return TRUE;
-  return FALSE;
+  FOR_ALL_TABS(tp) {
+    if (tp == tpc) {
+      return true;
+    }
+  }
+  return false;
 }
 
 /*
@@ -3285,14 +3296,11 @@ void win_goto(win_T *wp)
  */
 tabpage_T *win_find_tabpage(win_T *win)
 {
-  win_T       *wp;
-  tabpage_T   *tp;
-
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
-    for (wp = (tp == curtab ? firstwin : tp->tp_firstwin);
-         wp != NULL; wp = wp->w_next)
-      if (wp == win)
-        return tp;
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    if (wp == win) {
+      return tp;
+    }
+  }
   return NULL;
 }
 
@@ -3549,28 +3557,36 @@ win_T *buf_jump_open_win(buf_T *buf)
  */
 win_T *buf_jump_open_tab(buf_T *buf)
 {
-  win_T       *wp;
-  tabpage_T   *tp;
 
-  /* First try the current tab page. */
-  wp = buf_jump_open_win(buf);
-  if (wp != NULL)
-    return wp;
+  // First try the current tab page.
+  {
+    win_T *wp = buf_jump_open_win(buf);
+    if (wp != NULL)
+      return wp;
+  }
 
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+  FOR_ALL_TABS(tp) {
+    // Skip the current tab since we already checked it.
     if (tp != curtab) {
-      for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
-        if (wp->w_buffer == buf)
-          break;
-      if (wp != NULL) {
-        goto_tabpage_win(tp, wp);
-        if (curwin != wp)
-          wp = NULL;            /* something went wrong */
-        break;
+      FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+        if (wp->w_buffer == buf) {
+          goto_tabpage_win(tp, wp);
+
+          // If we the current window didn't switch,
+          // something went wrong.
+          if (curwin != wp) {
+            wp = NULL;
+          }
+
+          // Return the window we switched to.
+          return wp;
+        }
       }
     }
+  }
 
-  return wp;
+  // If we made it this far, we didn't find the buffer.
+  return NULL;
 }
 
 /*
@@ -4968,18 +4984,15 @@ int tabline_height(void)
  */
 int min_rows(void)
 {
-  int total;
-  tabpage_T   *tp;
-  int n;
-
   if (firstwin == NULL)         /* not initialized yet */
     return MIN_LINES;
 
-  total = 0;
-  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
-    n = frame_minheight(tp->tp_topframe, NULL);
-    if (total < n)
+  int total = 0;
+  FOR_ALL_TABS(tp) {
+    int n = frame_minheight(tp->tp_topframe, NULL);
+    if (total < n) {
       total = n;
+    }
   }
   total += tabline_height();
   total += 1;           /* count the room for the command line */
@@ -5019,16 +5032,15 @@ int only_one_window(void)
  */
 void check_lnums(int do_curwin)
 {
-  win_T       *wp;
-
-  tabpage_T   *tp;
-
-  FOR_ALL_TAB_WINDOWS(tp, wp)
-  if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf) {
-    if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count)
-      wp->w_cursor.lnum = curbuf->b_ml.ml_line_count;
-    if (wp->w_topline > curbuf->b_ml.ml_line_count)
-      wp->w_topline = curbuf->b_ml.ml_line_count;
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf) {
+      if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count) {
+        wp->w_cursor.lnum = curbuf->b_ml.ml_line_count;
+      }
+      if (wp->w_topline > curbuf->b_ml.ml_line_count) {
+        wp->w_topline = curbuf->b_ml.ml_line_count;
+      }
+    }
   }
 }
 
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 66d43ff7ca..793be3172d 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -43,7 +43,11 @@ if(CMAKE_GENERATOR MATCHES "Makefiles")
   set(MAKE_PRG "$(MAKE)")
 endif()
 
-set(DEPS_C_COMPILER "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}")
+if(CMAKE_C_COMPILER_ARG1)
+  set(DEPS_C_COMPILER "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}")
+else()
+  set(DEPS_C_COMPILER "${CMAKE_C_COMPILER}")
+endif()
 
 include(ExternalProject)