[SCM] Vim packaging branch, master, updated. debian/7.2.284-1-74-g911bf8e
James Vega
jamessan at debian.org
Thu Jan 14 06:02:19 UTC 2010
The following commit has been merged in the master branch:
commit 020f6a234f8e5852d65b0f739ef7ea90df7cb9a2
Merge: 5468bf1a747fee7b1318664be23d3d8c0ab4ae6b 12ac9a35df9df80d8cb34a1f0ed1bce27276f0e1
Author: James Vega <jamessan at debian.org>
Date: Wed Jan 13 08:14:19 2010 -0500
Merge branch 'debian'
Conflicts:
runtime/doc/pi_netrw.txt
runtime/ftplugin/gitcommit.vim
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined runtime/doc/options.txt
index c31acf6,e178613..9eacc81
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@@ -1,4 -1,4 +1,4 @@@
- *options.txt* For Vim version 7.2. Last change: 2009 Oct 12
+ *options.txt* For Vim version 7.2. Last change: 2010 Jan 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@@ -813,11 -813,11 +813,11 @@@ A jump table for the options with a sho
When 'background' is set Vim will adjust the default color groups for
the new value. But the colors used for syntax highlighting will not
change. *g:colors_name*
- When a color scheme is loaded (the "colors_name" variable is set)
+ When a color scheme is loaded (the "g:colors_name" variable is set)
setting 'background' will cause the color scheme to be reloaded. If
the color scheme adjusts to the value of 'background' this will work.
However, if the color scheme sets 'background' itself the effect may
- be undone. First delete the "colors_name" variable when needed.
+ be undone. First delete the "g:colors_name" variable when needed.
When setting 'background' to the default value with: >
:set background&
@@@ -1760,8 -1760,8 +1760,8 @@@
set and to the Vim default value when 'compatible' is reset.
NOTE: This option is set to the POSIX default value at startup when
the Vi default value would be used and the $VIM_POSIX environment
- variable exists |posix|. This means tries to behave like the POSIX
- specification.
+ variable exists |posix|. This means Vim tries to behave like the
+ POSIX specification.
contains behavior ~
*cpo-a*
@@@ -2451,6 -2451,9 +2451,9 @@@
'eadirection' option tells in which direction the size is affected.
Changing the height and width of a window can be avoided by setting
'winfixheight' and 'winfixwidth', respectively.
+ If a window size is specified when creating a new window sizes are
+ currently not equalized (it's complicated, but may be implemented in
+ the future).
*'equalprg'* *'ep'*
'equalprg' 'ep' string (default "")
@@@ -3247,7 -3250,7 +3250,7 @@@
the case of X). The font names given should be "normal" fonts. Vim
will try to find the related bold and italic fonts.
- For Win32, GTK, Mac OS and Photon: >
+ For Win32, GTK, Motif, Mac OS and Photon: >
:set guifont=*
< will bring up a font requester, where you can pick the font you want.
@@@ -4622,7 -4625,7 +4625,7 @@@
*'modeline'* *'ml'* *'nomodeline'* *'noml'*
'modeline' 'ml' boolean (Vim default: on (off for root),
- Vi default: off)
+ Debian: off, Vi default: off)
local to buffer
*'modelines'* *'mls'*
'modelines' 'mls' number (default 5)
@@@ -5912,8 -5915,12 +5915,12 @@@
{not available when compiled without the |+linebreak|
feature}
String to put at the start of lines that have been wrapped. Useful
- values are "> " or "+++ ".
- Only printable single-cell characters are allowed, excluding <Tab> and
+ values are "> " or "+++ ": >
+ :set showbreak=>\
+ < Note the backslash to escape the trailing space. It's easier like
+ this: >
+ :let &showbreak = '+++ '
+ < Only printable single-cell characters are allowed, excluding <Tab> and
comma (in a future version the comma might be used to separate the
part that is shown at the end and at the start of a line).
The characters are highlighted according to the '@' flag in
diff --combined runtime/filetype.vim
index 9beb635,3f176f3..26aee3d
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@@ -1,7 -1,7 +1,7 @@@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram at vim.org>
- " Last Change: 2009 Sep 18
+ " Last Change: 2009 Dec 24
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@@ -710,9 -710,9 +710,9 @@@ au BufNewFile,BufRead *.mo,*.gdmo set
au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
" Git
- autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
- autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig
- autocmd BufNewFile,BufRead git-rebase-todo setf gitrebase
+ autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
+ autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
+ autocmd BufNewFile,BufRead git-rebase-todo setf gitrebase
autocmd BufNewFile,BufRead .msg.[0-9]*
\ if getline(1) =~ '^From.*# This line is ignored.$' |
\ setf gitsendemail |
@@@ -1596,7 -1596,7 +1596,7 @@@ au BufNewFile,BufRead *.builder,*.rxml,
" Rantfile and Rakefile is like Ruby
au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake setf ruby
- " S-lang (or shader language!)
+ " S-lang (or shader language, or SmallLisp)
au BufNewFile,BufRead *.sl setf slang
" Samba config
@@@ -2010,7 -2010,7 +2010,7 @@@ func! s:FTtex(
call cursor(1,1)
let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
- let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
+ let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>\|part\>\|chapter\>\|section\>\|subsection\>\|subsubsection\>\|paragraph\>\|subparagraph\>\|subsubparagraph'
let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
\ 'cnp', firstNC + 1000)
@@@ -2438,6 -2438,12 +2438,12 @@@ au BufNewFile,BufRead /etc/xinetd.d/*
au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
+
+ " Use the filetype detect plugins. They may overrule any of the previously
+ " detected filetypes.
+ runtime! ftdetect/*.vim
+
+
" Generic configuration file (check this last, it's just guessing!)
au BufNewFile,BufRead,StdinReadPost *
\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
@@@ -2446,10 -2452,6 +2452,6 @@@
\ setf conf |
\ endif
- " Use the plugin-filetype checks last, they may overrule any of the previously
- " detected filetypes.
- runtime! ftdetect/*.vim
-
augroup END
diff --combined runtime/scripts.vim
index 1639e0d,0b3b135..d250b45
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@@ -1,7 -1,7 +1,7 @@@
" Vim support file to detect file types in scripts
"
" Maintainer: Bram Moolenaar <Bram at vim.org>
- " Last change: 2008 Sep 05
+ " Last change: 2009 Dec 24
" This file is called by an autocommand for every file that has just been
" loaded into a buffer. It checks if the type of file can be recognized by
@@@ -317,16 -317,8 +317,16 @@@ els
elseif s:line1 =~ 'exec\s\+\S*scheme' || s:line2 =~ 'exec\s\+\S*scheme'
set ft=scheme
+ " rst files
+ elseif s:line1 =~ '^\.\.\s\|^\s*restindex\s*$'
+ \ || s:line2 =~ '^\.\.\s\|^\s*restindex\s*$'
+ \ || s:line3 =~ '^\.\.\s\|^\s*restindex\s*$'
+ \ || s:line4 =~ '^\.\.\s\|^\s*restindex\s*$'
+ \ || s:line5 =~ '^\.\.\s\|^\s*restindex\s*$'
+ set ft=rst
+
" Git output
- elseif s:line1 =~ '^\(commit\|tree\|object\) \x\{40\}$\|^tag \S\+$'
+ elseif s:line1 =~ '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$'
set ft=git
" CVS diff
diff --combined runtime/syntax/tex.vim
index a34dbeb,ff171d3..6898834
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@@ -1,8 -1,8 +1,8 @@@
" Vim syntax file
" Language: TeX
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrchipO at ScampbellPfamily.AbizM>
- " Last Change: Feb 05, 2009
- " Version: 45
+ " Last Change: Dec 28, 2009
+ " Version: 46
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
"
" Notes: {{{1
@@@ -180,12 -180,12 +180,12 @@@ syn match texLigature "\\\([ijolL]\|ae
" \begin{}/\end{} section markers: {{{1
syn match texSectionMarker "\\begin\>\|\\end\>" nextgroup=texSectionName
- syn region texSectionName matchgroup=Delimiter start="{" end="}" contained nextgroup=texSectionModifier
- syn region texSectionModifier matchgroup=Delimiter start="\[" end="]" contained
+ syn region texSectionName matchgroup=Delimiter start="{" end="}" contained nextgroup=texSectionModifier contains=texComment
+ syn region texSectionModifier matchgroup=Delimiter start="\[" end="]" contained contains=texComment
" \documentclass, \documentstyle, \usepackage: {{{1
syn match texDocType "\\documentclass\>\|\\documentstyle\>\|\\usepackage\>" nextgroup=texSectionName,texDocTypeArgs
- syn region texDocTypeArgs matchgroup=Delimiter start="\[" end="]" contained nextgroup=texSectionName
+ syn region texDocTypeArgs matchgroup=Delimiter start="\[" end="]" contained nextgroup=texSectionName contains=texComment
" Preamble syntax-based folding support: {{{1
if g:tex_fold_enabled && has("folding")
@@@ -194,10 -194,10 +194,10 @@@ endi
" TeX input: {{{1
syn match texInput "\\input\s\+[a-zA-Z/.0-9_^]\+"hs=s+7 contains=texStatement
- syn match texInputFile "\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}" contains=texStatement,texInputCurlies
+ syn match texInputFile "\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}" contains=texStatement,texInputCurlies,texInputFileOpt
syn match texInputFile "\\\(epsfig\|input\|usepackage\)\s*\(\[.*\]\)\={.\{-}}" contains=texStatement,texInputCurlies,texInputFileOpt
syn match texInputCurlies "[{}]" contained
- syn region texInputFileOpt matchgroup=Delimiter start="\[" end="\]" contained
+ syn region texInputFileOpt matchgroup=Delimiter start="\[" end="\]" contained contains=texComment
" Type Styles (LaTeX 2.09): {{{1
syn match texTypeStyle "\\rm\>"
@@@ -400,13 -400,13 +400,13 @@@ endi
" Separate lines used for verb` and verb# so that the end conditions {{{1
" will appropriately terminate. Ideally vim would let me save a
" character from the start pattern and re-use it in the end-pattern.
-syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" contains=@Spell
+syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>"
" listings package:
syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" contains=@Spell
" moreverb package:
-syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>" contains=@Spell
-syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>" contains=@Spell
-syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>" contains=@Spell
+syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>"
+syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>"
+syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>"
if version < 600
syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>"
syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>"
diff --combined src/main.c
index 912433c,4e027ab..1bac166
--- a/src/main.c
+++ b/src/main.c
@@@ -87,9 -87,6 +87,9 @@@ typedef struc
#ifdef FEAT_DIFF
int diff_mode; /* start with 'diff' set */
#endif
+#ifdef SYS_TINYRC_FILE
+ int vi_mode; /* started as "vi" */
+#endif
} mparm_T;
/* Values for edit_type. */
@@@ -207,9 -204,9 +207,9 @@@ mai
#ifdef STARTUPTIME
for (i = 1; i < argc; ++i)
{
- if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
+ if (STRICMP(argv[i], "--startuptime") == 0 && i + 1 < argc)
{
- time_fd = mch_fopen(argv[i] + 14, "a");
+ time_fd = mch_fopen(argv[i + 1], "a");
TIME_MSG("--- VIM STARTING ---");
break;
}
@@@ -369,14 -366,21 +369,21 @@@
* Check if the GUI can be started. Reset gui.starting if not.
* Don't know about other systems, stay on the safe side and don't check.
*/
- if (gui.starting && gui_init_check() == FAIL)
+ if (gui.starting)
{
- gui.starting = FALSE;
+ if (gui_init_check() == FAIL)
+ {
+ gui.starting = FALSE;
- /* When running "evim" or "gvim -y" we need the menus, exit if we
- * don't have them. */
- if (params.evim_mode)
- mch_exit(1);
+ /* When running "evim" or "gvim -y" we need the menus, exit if we
+ * don't have them. */
+ if (params.evim_mode)
+ mch_exit(1);
+ }
+ # if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+ /* Re-initialize locale, it may have been altered by gui_init_check() */
+ init_locale();
+ # endif
}
# endif
#endif
@@@ -1503,10 -1507,6 +1510,10 @@@ parse_command_name(parmp
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
+#ifdef SYS_TINYRC_FILE
+ else if (STRNICMP(initstr, "vi", 2) == 0)
+ parmp->vi_mode = TRUE;
+#endif
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
@@@ -1733,6 -1733,11 +1740,11 @@@ command_line_scan(parmp
want_argument = TRUE;
argv_idx += 3;
}
+ else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ {
+ want_argument = TRUE;
+ argv_idx += 11;
+ }
#ifdef FEAT_CLIENTSERVER
else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
; /* already processed -- no arg */
@@@ -1768,10 -1773,6 +1780,6 @@@
/* already processed, skip */
}
#endif
- else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
- {
- /* already processed, skip */
- }
else
{
if (argv[0][argv_idx])
@@@ -2068,7 -2069,7 +2076,7 @@@
mainerr(ME_GARBAGE, (char_u *)argv[0]);
--argc;
- if (argc < 1 && c != 'S')
+ if (argc < 1 && c != 'S') /* -S has an optional argument */
mainerr_arg_missing((char_u *)argv[0]);
++argv;
argv_idx = -1;
@@@ -2109,11 -2110,16 +2117,16 @@@
(char_u *)argv[0];
break;
- case '-': /* "--cmd {command}" execute command */
- if (parmp->n_pre_commands >= MAX_ARG_CMDS)
- mainerr(ME_EXTRA_CMD, NULL);
- parmp->pre_commands[parmp->n_pre_commands++] =
+ case '-':
+ if (argv[-1][2] == 'c')
+ {
+ /* "--cmd {command}" execute command */
+ if (parmp->n_pre_commands >= MAX_ARG_CMDS)
+ mainerr(ME_EXTRA_CMD, NULL);
+ parmp->pre_commands[parmp->n_pre_commands++] =
(char_u *)argv[0];
+ }
+ /* "--startuptime <file>" already handled */
break;
/* case 'd': -d {device} is handled in mch_check_win() for the
@@@ -2800,12 -2806,7 +2813,12 @@@ source_startup_scripts(parmp
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
- (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
+# if defined(SYS_TINYRC_FILE) && defined(TINY_VIMRC)
+ if (parmp->vi_mode)
+ (void)do_source((char_u *)SYS_TINYRC_FILE, FALSE, DOSO_NONE);
+ else
+# endif
+ (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
@@@ -3156,6 -3157,9 +3169,9 @@@ usage(
main_msg(_("--serverlist\t\tList available Vim server names and exit"));
main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
#endif
+ #ifdef STARTUPTIME
+ main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
+ #endif
#ifdef FEAT_VIMINFO
main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
#endif
@@@ -3688,7 -3692,7 +3704,7 @@@ cmdsrv_main(argc, argv, serverName_arg
}
else if (STRICMP(argv[i], "--servername") == 0)
{
- /* Alredy processed. Take it out of the command line */
+ /* Already processed. Take it out of the command line */
i++;
continue;
}
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list