[SCM] Vim packaging branch, master, updated. debian/7.2.130-1-45-g35a70be
James Vega
jamessan at debian.org
Sun Apr 19 00:15:24 UTC 2009
The following commit has been merged in the master branch:
commit 25afd70bb4cadfdbd776d71d33323fa54801bebe
Merge: 1d64308f39b8d55e69bf0362c79bb03da67fc735 fd873195fc2f752d672b244f63d3f501f258aee5
Author: James Vega <jamessan at debian.org>
Date: Sat Apr 18 15:11:57 2009 -0400
Merge branch 'deb/runtime'
Conflicts:
runtime/syntax/debchangelog.vim
runtime/syntax/debsources.vim
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined runtime/filetype.vim
index 011cf04,5f1b8d5..f55716f
--- 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: 2008 Aug 03
+ " Last Change: 2008 Dec 14
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@@ -116,6 -116,9 +116,9 @@@ au BufNewFile,BufRead httpd.conf*,srm.c
" XA65 MOS6510 cross assembler
au BufNewFile,BufRead *.a65 setf a65
+ " Applescript
+ au BufNewFile,BufRead *.scpt setf applescript
+
" Applix ELF
au BufNewFile,BufRead *.am
\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
@@@ -350,10 -353,9 +353,9 @@@ au BufNewFile,BufRead *.cp
\ if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
" C++
+ au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.ipp,*.moc,*.tcc,*.inl setf cpp
if has("fname_case")
- au BufNewFile,BufRead *.cxx,*.c++,*.C,*.H,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl setf cpp
- else
- au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl setf cpp
+ au BufNewFile,BufRead *.C,*.H setf cpp
endif
" .h files can be C, Ch C++, ObjC or ObjC++.
@@@ -364,9 -366,9 +366,9 @@@ au BufNewFile,BufRead *.h call s:FThe
func! s:FTheader()
if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
setf objc
- elseif exists("c_syntax_for_h")
+ elseif exists("g:c_syntax_for_h")
setf c
- elseif exists("ch_syntax_for_h")
+ elseif exists("g:ch_syntax_for_h")
setf ch
else
setf cpp
@@@ -669,8 -671,9 +671,9 @@@ au BufNewFile,BufRead *.factor setf f
" Fetchmail RC file
au BufNewFile,BufRead .fetchmailrc setf fetchmail
- " FlexWiki
- au BufNewFile,BufRead *.wiki setf flexwiki
+ " FlexWiki - disabled, because it has side effects when a .wiki file
+ " is not actually FlexWiki
+ "au BufNewFile,BufRead *.wiki setf flexwiki
" Focus Executable
au BufNewFile,BufRead *.fex,*.focexec setf focexec
@@@ -704,7 -707,7 +707,7 @@@ au BufNewFile,BufRead .gdbinit setf g
au BufNewFile,BufRead *.mo,*.gdmo setf gdmo
" Gedcom
- au BufNewFile,BufRead *.ged setf gedcom
+ au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
" Git
autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
@@@ -975,9 -978,6 +978,9 @@@ au BufNewFile,BufRead *.lite,*.lt set
" LiteStep RC files
au BufNewFile,BufRead */LiteStep/*/*.rc setf litestep
+" Logcheck files
+au BufNewFile,BufRead /etc/logcheck/*.d/* setf logcheck
+
" Login access
au BufNewFile,BufRead /etc/login.access setf loginaccess
@@@ -1046,7 -1046,7 +1049,7 @@@ func! s:FTm(
let n = 1
while n < 10
let line = getline(n)
- if line =~ '^\s*\(#\s*\(include\|import\)\>\|/\*\)'
+ if line =~ '^\s*\(#\s*\(include\|import\)\>\|/\*\|//\)'
setf objc
return
endif
@@@ -1073,6 -1073,9 +1076,9 @@@ au BufNewFile,BufRead *.nb setf mm
" Maya Extension Language
au BufNewFile,BufRead *.mel setf mel
+ " Mercurial config (looks like generic config file)
+ au BufNewFile,BufRead *.hgrc,*hgrc setf cfg
+
" Messages
au BufNewFile,BufRead /var/log/messages,/var/log/messages.*[0-9] setf messages
@@@ -1263,7 -1266,7 +1269,7 @@@ if has("fname_case"
else
au BufNewFile,BufRead *.pl call s:FTpl()
endif
- au BufNewFile,BufRead *.plx setf perl
+ au BufNewFile,BufRead *.plx,*.al setf perl
func! s:FTpl()
if exists("g:filetype_pl")
@@@ -2082,8 -2085,13 +2088,13 @@@ au BufNewFile,BufRead *.vim,*.vba,.exrc
" Viminfo file
au BufNewFile,BufRead .viminfo,_viminfo setf viminfo
- " Virata Config Script File
- au BufRead,BufNewFile *.hw,*.module,*.pkg setf virata
+ " Virata Config Script File or Drupal module
+ au BufRead,BufNewFile *.hw,*.module,*.pkg
+ \ if getline(1) =~ '<?php' |
+ \ setf php |
+ \ else |
+ \ setf virata |
+ \ endif
" Visual Basic (also uses *.bas) or FORM
au BufNewFile,BufRead *.frm call s:FTVB("form")
@@@ -2328,6 -2336,9 +2339,9 @@@ au BufNewFile,BufRead *fvwm2rc
\| let b:fvwm_version = 2 | call s:StarSetf('fvwm')
\|endif
+ " Gedcom
+ au BufNewFile,BufRead /tmp/lltmp* call s:StarSetf('gedcom')
+
" GTK RC
au BufNewFile,BufRead .gtkrc*,gtkrc* call s:StarSetf('gtkrc')
diff --combined runtime/syntax/debchangelog.vim
index b411e1e,802d37d..a2b0b5c
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@@ -3,7 -3,7 +3,7 @@@
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
" Former Maintainers: Gerfried Fuchs <alfie at ist.org>
" Wichert Akkerman <wakkerma at debian.org>
- " Last Change: 2009-02-16
-" Last Change: 2009 Mar 09
++" Last Change: 2009 Feb 16
" URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/syntax/debchangelog.vim;hb=debian
" Standard syntax initialization
diff --combined runtime/syntax/debsources.vim
index e9510c9,51a7c1a..25f7251
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@@ -2,7 -2,7 +2,7 @@@
" Language: Debian sources.list
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
" Former Maintainer: Matthijs Mohlmann <matthijs at cacholong.nl>
- " Last Change: 2009-02-16
-" Last Change: 2009 Mar 09
++" Last Change: 2009 Feb 16
" URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/syntax/debsources.vim;hb=debian
" Standard syntax initialization
diff --combined src/option.c
index d3a5892,5e71c9b..78ed081
--- a/src/option.c
+++ b/src/option.c
@@@ -5797,14 -5797,28 +5797,28 @@@ did_set_string_option(opt_idx, varp, ne
/* load or unload key mapping tables */
errmsg = keymap_init();
- /* When successfully installed a new keymap switch on using it. */
- if (*curbuf->b_p_keymap != NUL && errmsg == NULL)
+ if (errmsg == NULL)
{
- curbuf->b_p_iminsert = B_IMODE_LMAP;
- if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
- curbuf->b_p_imsearch = B_IMODE_LMAP;
- set_iminsert_global();
- set_imsearch_global();
+ if (*curbuf->b_p_keymap != NUL)
+ {
+ /* Installed a new keymap, switch on using it. */
+ curbuf->b_p_iminsert = B_IMODE_LMAP;
+ if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
+ curbuf->b_p_imsearch = B_IMODE_LMAP;
+ }
+ else
+ {
+ /* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */
+ if (curbuf->b_p_iminsert == B_IMODE_LMAP)
+ curbuf->b_p_iminsert = B_IMODE_NONE;
+ if (curbuf->b_p_imsearch == B_IMODE_LMAP)
+ curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
+ }
+ if ((opt_flags & OPT_LOCAL) == 0)
+ {
+ set_iminsert_global();
+ set_imsearch_global();
+ }
# ifdef FEAT_WINDOWS
status_redraw_curbuf();
# endif
@@@ -6008,15 -6022,23 +6022,23 @@@
/* ":set t_Co=0" and ":set t_Co=1" do ":set t_Co=" */
if (varp == &T_CCO)
{
- t_colors = atoi((char *)T_CCO);
- if (t_colors <= 1)
+ int colors = atoi((char *)T_CCO);
+
+ /* Only reinitialize colors if t_Co value has really changed to
+ * avoid expensive reload of colorscheme if t_Co is set to the
+ * same value multiple times. */
+ if (colors != t_colors)
{
- if (new_value_alloced)
- vim_free(T_CCO);
- T_CCO = empty_option;
+ t_colors = colors;
+ if (t_colors <= 1)
+ {
+ if (new_value_alloced)
+ vim_free(T_CCO);
+ T_CCO = empty_option;
+ }
+ /* We now have a different color setup, initialize it again. */
+ init_highlight(TRUE, FALSE);
}
- /* We now have a different color setup, initialize it again. */
- init_highlight(TRUE, FALSE);
}
ttest(FALSE);
if (varp == &T_ME)
@@@ -7541,9 -7563,13 +7563,13 @@@ set_bool_option(opt_idx, varp, value, o
* set. */
if (STRCMP(p_enc, "utf-8") != 0)
{
+ static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'");
+
msg_source(hl_attr(HLF_W));
- MSG_ATTR(_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"),
- hl_attr(HLF_W));
+ MSG_ATTR(_(w_arabic), hl_attr(HLF_W));
+ #ifdef FEAT_EVAL
+ set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_arabic), -1);
+ #endif
}
# ifdef FEAT_MBYTE
@@@ -10268,7 -10294,7 +10294,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 */
@@@ -10289,11 -10315,6 +10315,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
@@@ -10304,29 -10325,23 +10330,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