aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0074

Browse Source
This commit is contained in:
Bram Moolenaar
2005-05-20 21:27:20 +00:00
parent 35c54e5651
commit c930a3cc82
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/filetype.vim
View File

@@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2005 May 18 " Last Change: 2005 May 20
" Listen very carefully, I will say this only once " Listen very carefully, I will say this only once
if exists("did_load_filetypes") if exists("did_load_filetypes")
@@ -528,6 +528,9 @@ au BufNewFile,BufRead *esmtprc setf esmtprc
" ESQL-C " ESQL-C
au BufNewFile,BufRead *.ec,*.EC setf esqlc au BufNewFile,BufRead *.ec,*.EC setf esqlc
" Esterel
au BufNewFile,BufRead *.strl setf esterel
" Essbase script " Essbase script
au BufNewFile,BufRead *.csc setf csc au BufNewFile,BufRead *.csc setf csc

16
src/edit.c
View File

@@ -6708,6 +6708,22 @@ ins_bs(c, mode, inserted_space_p)
{ {
temp = gchar_cursor(); /* remember current char */ temp = gchar_cursor(); /* remember current char */
--curwin->w_cursor.lnum; --curwin->w_cursor.lnum;
/* When "aw" is in 'formatoptions' we must delete the space at
* the end of the line, otherwise the line will be broken
* again when auto-formatting. */
if (has_format_option(FO_AUTO)
&& has_format_option(FO_WHITE_PAR))
{
char_u *ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum,
TRUE);
int len;
len = STRLEN(ptr);
if (len > 0 && ptr[len - 1] == ' ')
ptr[len - 1] = NUL;
}
(void)do_join(FALSE); (void)do_join(FALSE);
if (temp == NUL && gchar_cursor() != NUL) if (temp == NUL && gchar_cursor() != NUL)
inc_cursor(); inc_cursor();