Markus Heidelberg, 21.07.2008:
>
> The following has been fixed:
>
> - vimdiff can handle up to 4 files, not only 3
> - corrected FILES section in manpages:
> - files for PostScript printing are located in the print/ subdirectory (man
> vim)
> - path to evim.vim (man evim)
> - evim.man wasn't generated
> - added three command line options to the "vim --help" output
>
> The generated *.man and *.UTF-8.1 files aren't included. The Polish language
> is missing in runtime/doc/Makefile for conversion to UTF-8 and my *.man output
> had escape sequences included but the existing *.man files didn't. I was
> unsure so I let it. There are also no language-specific changes for the
> manpages (fr it pl ru), I can't speak them.
I have added pl in runtime/doc/Makefile, the former patch was malformed anyway
(quoted-printable). Have to look if it can be turned off.
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
Index: runtime/doc/vim.1
===================================================================
*** runtime/doc/vim.1 (revision 1114)
--- runtime/doc/vim.1 (working copy)
***************
*** 187,193 ****
.TP
\-d
Start in diff mode.
! There should be two or three file name arguments.
.B Vim
will open all the files and show differences between them.
Works like vimdiff(1).
--- 187,193 ----
.TP
\-d
Start in diff mode.
! There should be two, three or four file name arguments.
.B Vim
will open all the files and show differences between them.
Works like vimdiff(1).
***************
*** 522,528 ****
/usr/local/lib/vim/scripts.vim
Script to detect the type of a file by its contents. See ":help 'filetype'".
.TP
! /usr/local/lib/vim/*.ps
Files used for PostScript printing.
.PP
For recent info read the VIM home page:
--- 522,528 ----
/usr/local/lib/vim/scripts.vim
Script to detect the type of a file by its contents. See ":help 'filetype'".
.TP
! /usr/local/lib/vim/print/*.ps
Files used for PostScript printing.
.PP
For recent info read the VIM home page:
Index: runtime/doc/vim-fr.1
===================================================================
*** runtime/doc/vim-fr.1 (revision 1114)
--- runtime/doc/vim-fr.1 (working copy)
***************
*** 549,555 ****
Script pour d�tecter le type d'un fichier d'apr�s son contenu.
Voir ":help 'filetype'".
.TP
! /usr/local/lib/vim/*.ps
Fichiers utilis�s pour l'impression PostScript.
.PP
Pour disposer d'informations r�centes, consulter le site Internet de VIM :
--- 549,555 ----
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 :
Index: runtime/doc/vim-it.1
===================================================================
*** runtime/doc/vim-it.1 (revision 1114)
--- runtime/doc/vim-it.1 (working copy)
***************
*** 534,540 ****
Script Vim per determinare il tipo di un file a partire dal suo contenuto.
Vedere ":help 'filetype'".
.TP
! /usr/local/lib/vim/*.ps
File usati per stampa PostScript.
.PP
Per informazioni aggiornate [in inglese \- NdT] vedere la home page di Vim:
--- 534,540 ----
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:
Index: runtime/doc/vim-pl.1
===================================================================
*** runtime/doc/vim-pl.1 (revision 1114)
--- runtime/doc/vim-pl.1 (working copy)
***************
*** 523,529 ****
/usr/local/lib/vim/scripts.vim
Skrypt do wykrywania typu pliku wed�ug jego zawarto�ci. Zobacz ":help 'filetype'".
.TP
! /usr/local/lib/vim/*.ps
Pliku u�ywane do drukowania PostScriptu.
.PP
Naj�wie�sze wiadomo�ci na stronie
--- 523,529 ----
/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
Index: runtime/doc/vim-ru.1
===================================================================
*** runtime/doc/vim-ru.1 (revision 1114)
--- runtime/doc/vim-ru.1 (working copy)
***************
*** 452,458 ****
/usr/local/lib/vim/scripts.vim
�������� ��� ����������� ���� ����� �� �����������. ��. ":help 'filetype'".
.TP
! /usr/local/lib/vim/*.ps
����� ��� ������ PostScript.
.PP
����� ������ ���������� -- �� ����� VIM:
--- 452,458 ----
/usr/local/lib/vim/scripts.vim
�������� ��� ����������� ���� ����� �� �����������. ��. ":help 'filetype'".
.TP
! /usr/local/lib/vim/print/*.ps
����� ��� ������ PostScript.
.PP
����� ������ ���������� -- �� ����� VIM:
Index: runtime/doc/vimdiff.1
===================================================================
*** runtime/doc/vimdiff.1 (revision 1114)
--- runtime/doc/vimdiff.1 (working copy)
***************
*** 1,17 ****
.TH VIMDIFF 1 "2001 March 30"
.SH NAME
! vimdiff \- edit two or three versions of a file with Vim and show differences
.SH SYNOPSIS
.br
.B vimdiff
! [options] file1 file2 [file3]
.PP
.B gvimdiff
.SH DESCRIPTION
.B Vimdiff
starts
.B Vim
! on two (or three) 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
--- 1,17 ----
.TH VIMDIFF 1 "2001 March 30"
.SH NAME
! vimdiff \- edit two, three or four versions of a file with Vim and show differences
.SH SYNOPSIS
.br
.B vimdiff
! [options] file1 file2 [file3 [file4]]
.PP
.B gvimdiff
.SH DESCRIPTION
.B Vimdiff
starts
.B 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
Index: runtime/doc/diff.txt
===================================================================
*** runtime/doc/diff.txt (revision 1114)
--- runtime/doc/diff.txt (working copy)
***************
*** 5,12 ****
*diff* *vimdiff* *gvimdiff* *diff-mode*
! This file describes the +diff feature: Showing differences between two or
! three versions of the same file.
The basics are explained in section |08.7| of the user manual.
--- 5,12 ----
*diff* *vimdiff* *gvimdiff* *diff-mode*
! This file describes the +diff feature: Showing differences between two, three
! or four versions of the same file.
The basics are explained in section |08.7| of the user manual.
***************
*** 49,55 ****
using the |-O| argument. This uses vertical splits. If you prefer horizontal
splits add the |-o| argument: >
! vimdiff -o file1 file2 [file3]
If you always prefer horizontal splits include "horizontal" in 'diffopt'.
--- 49,55 ----
using the |-O| argument. This uses vertical splits. If you prefer horizontal
splits add the |-o| argument: >
! vimdiff -o file1 file2 [file3 [file4]]
If you always prefer horizontal splits include "horizontal" in 'diffopt'.
Index: runtime/doc/help.txt
===================================================================
*** runtime/doc/help.txt (revision 1114)
--- runtime/doc/help.txt (working copy)
***************
*** 126,132 ****
|tabpage.txt| commands for using multiple tab pages
|syntax.txt| syntax highlighting
|spell.txt| spell checking
! |diff.txt| working with two or three versions of the same file
|autocmd.txt| automatically executing commands on an event
|filetype.txt| settings done specifically for a type of file
|eval.txt| expression evaluation, conditional commands
--- 126,132 ----
|tabpage.txt| commands for using multiple tab pages
|syntax.txt| syntax highlighting
|spell.txt| spell checking
! |diff.txt| working with two, three or four versions of the same file
|autocmd.txt| automatically executing commands on an event
|filetype.txt| settings done specifically for a type of file
|eval.txt| expression evaluation, conditional commands
Index: runtime/doc/Makefile
===================================================================
*** runtime/doc/Makefile (revision 1114)
--- runtime/doc/Makefile (working copy)
***************
*** 287,292 ****
--- 287,297 ----
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 \
***************
*** 296,302 ****
.SUFFIXES:
.SUFFIXES: .c .o .txt .html
! all: tags vim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
--- 301,307 ----
.SUFFIXES:
.SUFFIXES: .c .o .txt .html
! all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
***************
*** 314,319 ****
--- 319,327 ----
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
***************
*** 445,450 ****
--- 453,473 ----
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 $< >$@
Index: src/installman.sh
===================================================================
*** src/installman.sh (revision 1114)
--- src/installman.sh (working copy)
***************
*** 32,37 ****
--- 32,38 ----
evimname=$9
helpsubloc=$scriptloc/doc
+ printsubloc=$scriptloc/print
synsubloc=$scriptloc/syntax
tutorsubloc=$scriptloc/tutor
***************
*** 48,63 ****
sed -e s+/usr/local/lib/vim+$vimloc+ \
-e s+$vimloc/doc+$helpsubloc+ \
-e s+$vimloc/syntax+$synsubloc+ \
- -e s+$vimloc/tutor+$tutorsubloc+ \
-e s+$vimloc/vimrc+$vimrcloc/vimrc+ \
-e s+$vimloc/gvimrc+$vimrcloc/gvimrc+ \
-e s+$vimloc/menu.vim+$scriptloc/menu.vim+ \
-e s+$vimloc/bugreport.vim+$scriptloc/bugreport.vim+ \
-e s+$vimloc/filetype.vim+$scriptloc/filetype.vim+ \
- -e s+$vimloc/ftoff.vim+$scriptloc/ftoff.vim+ \
-e s+$vimloc/scripts.vim+$scriptloc/scripts.vim+ \
-e s+$vimloc/optwin.vim+$scriptloc/optwin.vim+ \
! -e 's+$vimloc/\*.ps+$scriptloc/\*.ps+' \
$helpsource/vim$langadd.1 > $destdir/$exename.1
chmod $manmod $destdir/$exename.1
--- 49,62 ----
sed -e s+/usr/local/lib/vim+$vimloc+ \
-e s+$vimloc/doc+$helpsubloc+ \
-e s+$vimloc/syntax+$synsubloc+ \
-e s+$vimloc/vimrc+$vimrcloc/vimrc+ \
-e s+$vimloc/gvimrc+$vimrcloc/gvimrc+ \
-e s+$vimloc/menu.vim+$scriptloc/menu.vim+ \
-e s+$vimloc/bugreport.vim+$scriptloc/bugreport.vim+ \
-e s+$vimloc/filetype.vim+$scriptloc/filetype.vim+ \
-e s+$vimloc/scripts.vim+$scriptloc/scripts.vim+ \
-e s+$vimloc/optwin.vim+$scriptloc/optwin.vim+ \
! -e s+$vimloc/print+$printsubloc+ \
$helpsource/vim$langadd.1 > $destdir/$exename.1
chmod $manmod $destdir/$exename.1
***************
*** 76,81 ****
--- 75,81 ----
# evim.1
echo installing $destdir/$evimname.1
sed -e s+/usr/local/lib/vim+$vimloc+ \
+ -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
$helpsource/evim$langadd.1 > $destdir/$evimname.1
chmod $manmod $destdir/$evimname.1
fi
Index: src/main.c
===================================================================
*** src/main.c (revision 1114)
--- src/main.c (working copy)
***************
*** 3021,3026 ****
--- 3021,3027 ----
#endif
main_msg(_("-v\t\t\tVi mode (like \"vi\")"));
main_msg(_("-e\t\t\tEx mode (like \"ex\")"));
+ main_msg(_("-E\t\t\tImproved Ex mode (like \"exim\")"));
main_msg(_("-s\t\t\tSilent (batch) mode (only for \"ex\")"));
#ifdef FEAT_DIFF
main_msg(_("-d\t\t\tDiff mode (like \"vimdiff\")"));
***************
*** 3070,3075 ****
--- 3071,3078 ----
#endif
main_msg(_("+\t\t\tStart at end of file"));
main_msg(_("+<lnum>\t\tStart at line <lnum>"));
+ main_msg(_("+/<pat>\t\tStart at the first occurrence of the pattern <pat>"));
+ main_msg(_("+<command>\t\tSame as -c"));
main_msg(_("--cmd <command>\tExecute <command> before loading any vimrc file"));
main_msg(_("-c <command>\t\tExecute <command> after loading the first file"));
main_msg(_("-S <session>\t\tSource file <session> after loading the first file"));
