[SCM] Vim packaging branch, master, updated. debian/7.2.245-2-59-g5468bf1
James Vega
jamessan at debian.org
Sun Nov 8 22:56:21 UTC 2009
The following commit has been merged in the master branch:
commit c8f355b3713959aee5142d4b0c446de0e5059cb2
Merge: e236cc073240eef2b2e2929a33811592032a972e 05a38bf81767a37ea103a0b02ddbc266e866b14c
Author: James Vega <jamessan at debian.org>
Date: Sun Nov 8 16:50:17 2009 -0500
Merge branch 'debian'
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 b21bb27,4258271..9beb635
--- 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")
@@@ -1561,6 -1561,7 +1561,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
@@@ -2009,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)
diff --combined src/main.c
index 4f159dc,5bb81a6..912433c
--- 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. */
@@@ -133,10 -130,6 +133,6 @@@ static char_u *serverMakeName __ARGS((c
#endif
- #ifdef STARTUPTIME
- static FILE *time_fd = NULL;
- #endif
-
/*
* Different types of error messages.
*/
@@@ -176,6 -169,9 +172,9 @@@ mai
char_u *fname = NULL; /* file name from command line */
mparm_T params; /* various parameters passed between
* main() and other functions. */
+ #ifdef STARTUPTIME
+ int i;
+ #endif
/*
* Do any system-specific initialisations. These can NOT use IObuff or
@@@ -206,8 -202,15 +205,15 @@@
#endif
#ifdef STARTUPTIME
- time_fd = mch_fopen(STARTUPTIME, "a");
- TIME_MSG("--- VIM STARTING ---");
+ for (i = 1; i < argc; ++i)
+ {
+ if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
+ {
+ time_fd = mch_fopen(argv[i] + 14, "a");
+ TIME_MSG("--- VIM STARTING ---");
+ break;
+ }
+ }
#endif
starttime = time(NULL);
@@@ -1153,6 -1156,18 +1159,18 @@@ main_loop(cmdwin, noexmode
cursor_on();
do_redraw = FALSE;
+
+ #ifdef STARTUPTIME
+ /* Now that we have drawn the first screen all the startup stuff
+ * has been done, close any file for startup messages. */
+ if (time_fd != NULL)
+ {
+ TIME_MSG("first screen update");
+ TIME_MSG("--- VIM STARTED ---");
+ fclose(time_fd);
+ time_fd = NULL;
+ }
+ #endif
}
#ifdef FEAT_GUI
if (need_mouse_correct)
@@@ -1485,10 -1500,6 +1503,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)
@@@ -1750,6 -1761,10 +1768,10 @@@ command_line_scan(parmp
/* already processed, skip */
}
#endif
+ else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ {
+ /* already processed, skip */
+ }
else
{
if (argv[0][argv_idx])
@@@ -2778,12 -2793,7 +2800,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);
@@@ -3223,6 -3233,20 +3245,20 @@@ static void time_diff __ARGS((struct ti
static struct timeval prev_timeval;
+ # ifdef WIN3264
+ /*
+ * Windows doesn't have gettimeofday(), although it does have struct timeval.
+ */
+ static int
+ gettimeofday(struct timeval *tv, char *dummy)
+ {
+ long t = clock();
+ tv->tv_sec = t / CLOCKS_PER_SEC;
+ tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
+ return 0;
+ }
+ # endif
+
/*
* Save the previous time before doing something that could nest.
* set "*tv_rel" to the time elapsed so far.
@@@ -3311,20 -3335,6 +3347,6 @@@ time_msg(msg, tv_start
}
}
- # ifdef WIN3264
- /*
- * Windows doesn't have gettimeofday(), although it does have struct timeval.
- */
- int
- gettimeofday(struct timeval *tv, char *dummy)
- {
- long t = clock();
- tv->tv_sec = t / CLOCKS_PER_SEC;
- tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
- return 0;
- }
- # endif
-
#endif
#if defined(FEAT_CLIENTSERVER) || defined(PROTO)
diff --combined src/option.c
index fca1d86,d680cfb..cdd7d06
--- a/src/option.c
+++ b/src/option.c
@@@ -7430,6 -7430,8 +7430,8 @@@ set_bool_option(opt_idx, varp, value, o
{
if (curwin->w_p_wrap)
curwin->w_leftcol = 0;
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
}
#ifdef FEAT_WINDOWS
@@@ -7662,6 -7664,22 +7664,22 @@@
if (curwin->w_curswant != MAXCOL)
curwin->w_set_curswant = TRUE;
}
+ #endif
+
+ #ifdef FEAT_LINEBREAK
+ if ((int *)varp == &curwin->w_p_lbr)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
+ #endif
+
+ #ifdef FEAT_RIGHTLEFT
+ if ((int *)varp == &curwin->w_p_rl)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
#endif
/*
@@@ -10359,7 -10377,7 +10377,7 @@@ langmap_set(
{
char_u *p;
char_u *p2;
- int from, to;
+ int from=NUL, to=NUL;
#ifdef FEAT_MBYTE
ga_clear(&langmap_mapga); /* clear the previous map first */
@@@ -10380,11 -10398,6 +10398,11 @@@
p2 = NULL; /* aAbBcCdD form, p2 is NULL */
while (p[0])
{
+ if (p[0] == ',')
+ {
+ ++p;
+ break;
+ }
if (p[0] == '\\' && p[1] != NUL)
++p;
#ifdef FEAT_MBYTE
@@@ -10395,29 -10408,23 +10413,29 @@@
if (p2 == NULL)
{
mb_ptr_adv(p);
- if (p[0] == '\\')
- ++p;
+ if (p[0] != ',')
+ {
+ if (p[0] == '\\')
+ ++p;
#ifdef FEAT_MBYTE
- to = (*mb_ptr2char)(p);
+ to = (*mb_ptr2char)(p);
#else
- to = p[0];
+ to = p[0];
#endif
+ }
}
else
{
- if (p2[0] == '\\')
- ++p2;
+ if (p2[0] != ',')
+ {
+ if (p2[0] == '\\')
+ ++p2;
#ifdef FEAT_MBYTE
- to = (*mb_ptr2char)(p2);
+ to = (*mb_ptr2char)(p2);
#else
- to = p2[0];
+ to = p2[0];
#endif
+ }
}
if (to == NUL)
{
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list