[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2.245-133-g924a9ba
James Vega
jamessan at debian.org
Thu Oct 29 03:34:39 UTC 2009
The following commit has been merged in the deb/runtime branch:
commit 924a9bafd3b9a18386e5f320b077e2ec6989523f
Merge: 7d8105d672638926e5f706424a52f09a93f21f8f 60cbb45b25ad6986251ab04424623b0992e85dcf
Author: James Vega <jamessan at debian.org>
Date: Wed Oct 28 23:17:29 2009 -0400
Merge branch 'upstream-runtime' into deb/runtime
Conflicts:
runtime/doc/vim-ru.1
runtime/syntax/matlab.vim
runtime/syntax/samba.vim
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined runtime/doc/options.txt
index 516d227,7a306af..c31acf6
--- 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 Jun 12
+ *options.txt* For Vim version 7.2. Last change: 2009 Oct 12
VIM REFERENCE MANUAL by Bram Moolenaar
@@@ -2556,13 -2556,17 +2556,17 @@@ A jump table for the options with a sho
{not in Vi}
Sets the character encoding for the file of this buffer.
When 'fileencoding' is different from 'encoding', conversion will be
- done when reading and writing the file.
+ done when writing the file. For reading see below.
When 'fileencoding' is empty, the same value as 'encoding' will be
used (no conversion when reading or writing a file).
+ Conversion will also be done when 'encoding' and 'fileencoding' are
+ both a Unicode encoding and 'fileencoding' is not utf-8. That's
+ because internally Unicode is always stored as utf-8.
WARNING: Conversion can cause loss of information! When
- 'encoding' is "utf-8" conversion is most likely done in a way
- that the reverse conversion results in the same text. When
- 'encoding' is not "utf-8" some characters may be lost!
+ 'encoding' is "utf-8" or another Unicode encoding, conversion
+ is most likely done in a way that the reverse conversion
+ results in the same text. When 'encoding' is not "utf-8" some
+ characters may be lost!
See 'encoding' for the possible values. Additionally, values may be
specified that can be handled by the converter, see
|mbyte-conversion|.
@@@ -3791,7 -3795,7 +3795,7 @@@
English characters directly, e.g., when it's used to type accented
characters with dead keys.
- *'imdisable'* *'imd'* *'nodisable'* *'noimd'*
+ *'imdisable'* *'imd'* *'noimdisable'* *'noimd'*
'imdisable' 'imd' boolean (default off, on for some systems (SGI))
global
{not in Vi}
@@@ -4538,15 -4542,15 +4542,15 @@@
{not in Vi}
Maximum amount of memory (in Kbyte) to use for one buffer. When this
limit is reached allocating extra memory for a buffer will cause
- other memory to be freed. Maximum usable value about 2000000. Use
- this to work without a limit. Also see 'maxmemtot'.
+ other memory to be freed. The maximum usable value is about 2000000.
+ Use this to work without a limit. Also see 'maxmemtot'.
*'maxmempattern'* *'mmp'*
'maxmempattern' 'mmp' number (default 1000)
global
{not in Vi}
Maximum amount of memory (in Kbyte) to use for pattern matching.
- Maximum value about 2000000. Use this to work without a limit.
+ The maximum value is about 2000000. Use this to work without a limit.
*E363*
When Vim runs into the limit it gives an error message and mostly
behaves like CTRL-C was typed.
@@@ -4561,9 -4565,11 +4565,11 @@@
available)
global
{not in Vi}
- Maximum amount of memory (in Kbyte) to use for all buffers together.
- Maximum usable value 2000000. Use this to work without a limit. Also
- see 'maxmem'.
+ Maximum amount of memory in Kbyte to use for all buffers together.
+ The maximum usable value is about 2000000 (2 Gbyte). Use this to work
+ without a limit. On 64 bit machines higher values might work. But
+ hey, do you really need more than 2 Gbyte for text editing?
+ Also see 'maxmem'.
*'menuitems'* *'mis'*
'menuitems' 'mis' number (default 25)
@@@ -4616,7 -4622,7 +4622,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)
diff --combined runtime/filetype.vim
index 85f1d1b,576f20c..84cd0a4
--- 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 Jul 09
+ " Last Change: 2009 Sep 18
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@@ -1558,6 -1558,7 +1558,7 @@@ endfun
" Remind
au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
+ au BufNewFile,BufRead *.remind,*.rem setf remind
" Resolv.conf
au BufNewFile,BufRead resolv.conf setf resolv
@@@ -2006,7 -2007,7 +2007,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)
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list