thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

Fix a few compiler warnings.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-07-14 14:28:26 +02:00
parent 164fca39bd
commit d43848c0dd
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/doc/todo.txt
View File

@@ -1098,7 +1098,6 @@ Vim 7.3:
- Conceal feature: no update when moving to another window. (Dominique Pelle, - Conceal feature: no update when moving to another window. (Dominique Pelle,
2010 Jul 5) Vince will look into it. 2010 Jul 5) Vince will look into it.
Patches to possibly include: Patches to possibly include:
- Mac: console clipboard support. (Bjorn Winckler, 2010 Jul 12)
- Win32: patch for better font scaling. (George Reilly, 2009 Mar 26) - Win32: patch for better font scaling. (George Reilly, 2009 Mar 26)
- Patch for completion of ":find" arguments. (Nazri Ramliy, 2009 Feb 22, 26) - Patch for completion of ":find" arguments. (Nazri Ramliy, 2009 Feb 22, 26)
8 For ":find" and ":sfind" expand files found in 'path'. 8 For ":find" and ":sfind" expand files found in 'path'.
@@ -1154,10 +1153,6 @@ Needs some work:
You can already yank lines and use :@" to execute them. You can already yank lines and use :@" to execute them.
Most of do_source() would not be used, need a new function. Most of do_source() would not be used, need a new function.
It's easy when not doing breakpoints or profiling. It's easy when not doing breakpoints or profiling.
Probably not now:
- Use timestamps for undo, so that a version a certain time ago can be found
and info before some time/date can be flushed. 'undopersist' gives maximum
time to keep undo: "3h", "1d", "2w", "1y", etc.
More patches: More patches:
@@ -3954,6 +3949,11 @@ Searching:
Undo: Undo:
9 After undo/redo, in the message show whether the buffer is modified or 9 After undo/redo, in the message show whether the buffer is modified or
not. not.
8 Use timestamps for undo, so that a version a certain time ago can be found
and info before some time/date can be flushed. 'undopersist' gives maximum
time to keep undo: "3h", "1d", "2w", "1y", etc.
8 Search for pattern in undo tree, showing when it happened and the text
state, so that you can jump to it.
8 Undo tree: visually show the tree somehow (Damian Conway) 8 Undo tree: visually show the tree somehow (Damian Conway)
Show only the leaves, indicating how many changed from the branch and the Show only the leaves, indicating how many changed from the branch and the
timestamp? timestamp?
@@ -3964,8 +3964,6 @@ Undo:
was changed outside of Vim. was changed outside of Vim.
Would require doing a diff between the buffer text and the file and Would require doing a diff between the buffer text and the file and
storing the differences. storing the differences.
8 Search for pattern in undo tree, showing when it happened and the text
state, so that you can jump to it.
- Make it possible to undo all the commands from a mapping, including a - Make it possible to undo all the commands from a mapping, including a
trailing unfinished command, e.g. for ":map K iX^[r". trailing unfinished command, e.g. for ":map K iX^[r".
- When accidentally hitting "R" instead of Ctrl-R, further Ctrl-R is not - When accidentally hitting "R" instead of Ctrl-R, further Ctrl-R is not

3
src/ops.c
View File

@@ -4155,7 +4155,8 @@ do_join(count, insert_space, save_undo)
char_u *cend; char_u *cend;
char_u *newp; char_u *newp;
char_u *spaces; /* number of spaces inserte before a line */ char_u *spaces; /* number of spaces inserte before a line */
int endcurr1, endcurr2; int endcurr1 = NUL;
int endcurr2 = NUL;
int currsize = 0; /* size of the current line */ int currsize = 0; /* size of the current line */
int sumsize = 0; /* size of the long new line */ int sumsize = 0; /* size of the long new line */
linenr_T t; linenr_T t;

6
src/os_macosx.m
View File

@@ -686,7 +686,7 @@ clip_mch_request_selection(VimClipboard *cbd)
n = [mstring replaceOccurrencesOfString:@"\x0d" withString:@"\x0a" n = [mstring replaceOccurrencesOfString:@"\x0d" withString:@"\x0a"
options:0 range:range]; options:0 range:range];
} }
/* Scan for newline character to decide whether the string should be /* Scan for newline character to decide whether the string should be
* pasted line-wise or character-wise. * pasted line-wise or character-wise.
*/ */
@@ -734,7 +734,7 @@ clip_mch_set_selection(VimClipboard *cbd)
cbd->owned = TRUE; cbd->owned = TRUE;
clip_get_selection(cbd); clip_get_selection(cbd);
cbd->owned = FALSE; cbd->owned = FALSE;
/* Get the text to put on the pasteboard. */ /* Get the text to put on the pasteboard. */
long_u llen = 0; char_u *str = 0; long_u llen = 0; char_u *str = 0;
int motion_type = clip_convert_selection(&str, &llen, cbd); int motion_type = clip_convert_selection(&str, &llen, cbd);
@@ -771,7 +771,7 @@ clip_mch_set_selection(VimClipboard *cbd)
[pb setPropertyList:plist forType:VimPboardType]; [pb setPropertyList:plist forType:VimPboardType];
[pb setString:string forType:NSStringPboardType]; [pb setString:string forType:NSStringPboardType];
[string release]; [string release];
} }

7
src/proto.h
View File

@@ -277,6 +277,13 @@ extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path,
#ifdef MACOS_CONVERT #ifdef MACOS_CONVERT
# include "os_mac_conv.pro" # include "os_mac_conv.pro"
#endif #endif
#if defined(MACOS_X_UNIX) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI)
/* functions in os_macosx.m */
void clip_mch_lose_selection(VimClipboard *cbd);
int clip_mch_own_selection(VimClipboard *cbd);
void clip_mch_request_selection(VimClipboard *cbd);
void clip_mch_set_selection(VimClipboard *cbd);
#endif
#ifdef __BORLANDC__ #ifdef __BORLANDC__
# define _PROTO_H # define _PROTO_H