projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.258 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.258 | |
| 11 | Problem: MS-Windows: The edit with existing vim context menu entries can be | |
| 12 | unwanted. | |
| 13 | Solution: Let a registry entry disable them. (Jerome Vuarand) | |
| 14 | Files: src/GvimExt/gvimext.cpp | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.257/src/GvimExt/gvimext.cpp 2010-08-15 21:57:29.000000000 +0200 | |
| 18 | --- src/GvimExt/gvimext.cpp 2011-07-20 16:48:09.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 586,593 **** | |
| 21 | ||
| 22 | // Initialize m_cntOfHWnd to 0 | |
| 23 | m_cntOfHWnd = 0; | |
| 24 | ! // Retrieve all the vim instances | |
| 25 | ! EnumWindows(EnumWindowsProc, (LPARAM)this); | |
| 26 | ||
| 27 | if (cbFiles > 1) | |
| 28 | { | |
| 29 | --- 586,608 ---- | |
| 30 | ||
| 31 | // Initialize m_cntOfHWnd to 0 | |
| 32 | m_cntOfHWnd = 0; | |
| 33 | ! | |
| 34 | ! HKEY keyhandle; | |
| 35 | ! bool showExisting = true; | |
| 36 | ! | |
| 37 | ! // Check whether "Edit with existing Vim" entries are disabled. | |
| 38 | ! if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", 0, | |
| 39 | ! KEY_READ, &keyhandle) == ERROR_SUCCESS) | |
| 40 | ! { | |
| 41 | ! if (RegQueryValueEx(keyhandle, "DisableEditWithExisting", 0, NULL, | |
| 42 | ! NULL, NULL) == ERROR_SUCCESS) | |
| 43 | ! showExisting = false; | |
| 44 | ! RegCloseKey(keyhandle); | |
| 45 | ! } | |
| 46 | ! | |
| 47 | ! // Retrieve all the vim instances, unless disabled. | |
| 48 | ! if (showExisting) | |
| 49 | ! EnumWindows(EnumWindowsProc, (LPARAM)this); | |
| 50 | ||
| 51 | if (cbFiles > 1) | |
| 52 | { | |
| 53 | *** ../vim-7.3.257/src/version.c 2011-07-20 16:36:35.000000000 +0200 | |
| 54 | --- src/version.c 2011-07-20 16:54:34.000000000 +0200 | |
| 55 | *************** | |
| 56 | *** 711,712 **** | |
| 57 | --- 711,714 ---- | |
| 58 | { /* Add new patch number below this line */ | |
| 59 | + /**/ | |
| 60 | + 258, | |
| 61 | /**/ | |
| 62 | ||
| 63 | -- | |
| 64 | What the word 'politics' means: 'Poli' in Latin meaning 'many' and 'tics' | |
| 65 | meaning 'bloodsucking creatures'. | |
| 66 | ||
| 67 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 68 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 69 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 70 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |