diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index f368de35b..665380786 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -8912,11 +8912,11 @@ A jump table for the options with a short description can be found at |Q_op|. displayed when 'verbosefile' is set. *'viewdir'* *'vdir'* -'viewdir' 'vdir' string (default for Amiga and Win32: - "$VIM/vimfiles/view", - for Unix: "~/.vim/view", - for macOS: "$VIM:vimfiles:view" - for VMS: "sys$login:vimfiles/view") +'viewdir' 'vdir' string (default for Amiga "$VIM/vimfiles/view", + for Win32: "$HOME/vimfiles/view", + for Unix: "~/.vim/view", + for macOS: "$VIM/vimfiles/view" + for VMS: "sys$login:vimfiles/view") global {not available when compiled without the |+mksession| feature} diff --git a/src/os_dos.h b/src/os_dos.h index f1fcbe6b7..f53434824 100644 --- a/src/os_dos.h +++ b/src/os_dos.h @@ -97,7 +97,7 @@ #endif #ifndef DFLT_VDIR -# define DFLT_VDIR "$VIM/vimfiles/view" // default for 'viewdir' +# define DFLT_VDIR "$HOME/vimfiles/view" // default for 'viewdir' #endif #ifndef DFLT_DIR @@ -105,7 +105,7 @@ #endif #define DFLT_ERRORFILE "errors.err" -#define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/vimfiles/after" +#define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$HOME/vimfiles/after,$VIM/vimfiles/after" #define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after" #define CASE_INSENSITIVE_FILENAME // ignore case when comparing file names diff --git a/src/version.c b/src/version.c index 5535b9a35..85f4db12b 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1650, /**/ 1649, /**/