diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-06-16 21:59:56 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-06-16 21:59:56 +0000 |
| commit | 520470a9d6afa273294848bc31e9ddfabe130434 (patch) | |
| tree | 68eca1fa27b8113e3d4c9cbeeb4e72ec31e6dc6f /src | |
| parent | 6bab4d1fd761c6489e63d53d7834344cb0d3a74e (diff) | |
| download | vim-git-520470a9d6afa273294848bc31e9ddfabe130434.tar.gz | |
updated for version 7.0086v7.0086
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_w32.c | 16 | ||||
| -rw-r--r-- | src/proto/misc2.pro | 2 | ||||
| -rw-r--r-- | src/search.c | 2 | ||||
| -rw-r--r-- | src/version.h | 4 |
4 files changed, 21 insertions, 3 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 8046a8df0..3ecedde10 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -498,6 +498,18 @@ _OnMouseWheel( _OnScroll(hwnd, hwndCtl, zDelta >= 0 ? SB_PAGEUP : SB_PAGEDOWN, 0); } +/* + * Invoked when a setting was changed. + */ + static LRESULT CALLBACK +_OnSettingChange(UINT n) +{ + if (n == SPI_SETWHEELSCROLLLINES) + SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, + &mouse_scroll_lines, 0); + return 0; +} + #if 0 /* disabled, a gap appears below and beside the window, and the window can be moved (in a strange way) */ /* @@ -686,6 +698,10 @@ _WndProc( _OnMouseWheel(hwnd, HIWORD(wParam)); break; + /* Notification for change in SystemParametersInfo() */ + case WM_SETTINGCHANGE: + return _OnSettingChange((UINT)wParam); + #ifdef FEAT_TOOLBAR case WM_NOTIFY: switch (((LPNMHDR) lParam)->code) diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro index 38d50a985..6d7963153 100644 --- a/src/proto/misc2.pro +++ b/src/proto/misc2.pro @@ -94,4 +94,6 @@ void sort_strings __ARGS((char_u **files, int count)); int pathcmp __ARGS((const char *p, const char *q, int maxlen)); char_u *parse_list_options __ARGS((char_u *option_str, option_table_T *table, int table_size)); int filewritable __ARGS((char_u *fname)); +int emsg3 __ARGS((char_u *s, char_u *a1, char_u *a2)); +int emsgn __ARGS((char_u *s, long n)); /* vim: set ft=c : */ diff --git a/src/search.c b/src/search.c index 9d2981736..537076942 100644 --- a/src/search.c +++ b/src/search.c @@ -2224,7 +2224,7 @@ check_linecomment(line) int instr = FALSE; /* inside of string */ p = line; /* scan from start */ - while ((p = vim_strpbrk(p, "\";")) != NULL) + while ((p = vim_strpbrk(p, (char_u *)"\";")) != NULL) { if (*p == '"') { diff --git a/src/version.h b/src/version.h index c9e81ea1d..3366bb16a 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 14)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 14, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 16)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 16, compiled " |