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.1-247

Browse Source
This commit is contained in:
Bram Moolenaar
2008-02-13 09:58:14 +00:00
parent 8b131505eb
commit e21877ae75
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/misc1.c
View File

@@ -2270,13 +2270,16 @@ del_bytes(count, fixpos_arg, use_delcombine)
/*
* If the old line has been allocated the deletion can be done in the
* existing line. Otherwise a new line has to be allocated
* Can't do this when using Netbeans, because we would need to invoke
* netbeans_removed(), which deallocates the line. Let ml_replace() take
* care of notifiying Netbeans.
*/
was_alloced = ml_line_alloced(); /* check if oldp was allocated */
#ifdef FEAT_NETBEANS_INTG
if (was_alloced && usingNetbeans)
netbeans_removed(curbuf, lnum, col, count);
/* else is handled by ml_replace() */
if (usingNetbeans)
was_alloced = FALSE;
else
#endif
was_alloced = ml_line_alloced(); /* check if oldp was allocated */
if (was_alloced)
newp = oldp; /* use same allocated memory */
else
@@ -3978,7 +3981,7 @@ vim_getenv(name, mustfree)
/* remove trailing path separator */
#ifndef MACOS_CLASSIC
/* With MacOS path (with colons) the final colon is required */
/* to avoid confusion between absoulute and relative path */
/* to avoid confusion between absolute and relative path */
if (pend > p && after_pathsep(p, pend))
--pend;
#endif
@@ -5689,7 +5692,7 @@ cin_is_cpp_baseclass(col)
else if (lookfor_ctor_init || class_or_struct)
{
/* we have something found, that looks like the start of
* cpp-base-class-declaration or contructor-initialization */
* cpp-base-class-declaration or constructor-initialization */
cpp_base_class = TRUE;
lookfor_ctor_init = class_or_struct = FALSE;
*col = 0;
@@ -6146,7 +6149,7 @@ get_c_indent()
pos_T our_paren_pos;
char_u *start;
int start_brace;
#define BRACE_IN_COL0 1 /* '{' is in comumn 0 */
#define BRACE_IN_COL0 1 /* '{' is in column 0 */
#define BRACE_AT_START 2 /* '{' is at start of line */
#define BRACE_AT_END 3 /* '{' is at end of line */
linenr_T ourscope;
@@ -6369,7 +6372,7 @@ get_c_indent()
if (curwin->w_cursor.lnum > 1)
{
/* If the start comment string matches in the previous
* line, use the indent of that line pluss offset. If
* line, use the indent of that line plus offset. If
* the middle comment string matches in the previous
* line, use the indent of that line. XXX */
look = skipwhite(ml_get(curwin->w_cursor.lnum - 1));
@@ -8222,7 +8225,7 @@ get_lisp_indent()
if (*that && *that != ';') /* not a comment line */
{
/* test *that != '(' to accomodate first let/do
/* test *that != '(' to accommodate first let/do
* argument if it is more than one line */
if (!vi_lisp && *that != '(' && *that != '[')
firsttry++;