diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-07-20 17:27:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-07-20 17:27:25 +0200 |
| commit | ce35c88adedd855fe9b0a93c9f1d38388fd928f0 (patch) | |
| tree | d52ba6a527c6c001358a6d63c7c3167701c3f559 /src | |
| parent | e9edd7fbdd1d815f6135e269dbc94bd0824cf33f (diff) | |
| download | vim-git-ce35c88adedd855fe9b0a93c9f1d38388fd928f0.tar.gz | |
updated for version 7.3.258v7.3.258
Problem: MS-Windows: The edit with existing vim context menu entries can be
unwanted.
Solution: Let a registry entry disable them. (Jerome Vuarand)
Diffstat (limited to 'src')
| -rw-r--r-- | src/GvimExt/gvimext.cpp | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp index 55d5a7633..7c7ec99d3 100644 --- a/src/GvimExt/gvimext.cpp +++ b/src/GvimExt/gvimext.cpp @@ -586,8 +586,23 @@ STDMETHODIMP CShellExt::QueryContextMenu(HMENU hMenu, // Initialize m_cntOfHWnd to 0 m_cntOfHWnd = 0; - // Retrieve all the vim instances - EnumWindows(EnumWindowsProc, (LPARAM)this); + + HKEY keyhandle; + bool showExisting = true; + + // Check whether "Edit with existing Vim" entries are disabled. + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", 0, + KEY_READ, &keyhandle) == ERROR_SUCCESS) + { + if (RegQueryValueEx(keyhandle, "DisableEditWithExisting", 0, NULL, + NULL, NULL) == ERROR_SUCCESS) + showExisting = false; + RegCloseKey(keyhandle); + } + + // Retrieve all the vim instances, unless disabled. + if (showExisting) + EnumWindows(EnumWindowsProc, (LPARAM)this); if (cbFiles > 1) { diff --git a/src/version.c b/src/version.c index 6c1cfdcc5..f007bc580 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 258, +/**/ 257, /**/ 256, |