From 0405665638052ca1180bdb2855237cd1868526a3 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sat, 1 Nov 2025 16:15:39 +0000 Subject: [PATCH] patch 9.1.1893: ICCF charity will dissolve Problem: ICCF charity will dissolve Solution: Update references to Kuwasha Since the ICCF[1] will be dissolved and handing over to the Kuwasha charity to continue supporting the Kibaale Children Center in Uganda, update the uganda.txt help file. [1]: https://groups.google.com/g/vim_announce/c/pUNbNXBLbKw/m/-zFUd4JjAQAJ fixes: #18584 closes: #18667 Signed-off-by: Signed-off-by: Christian Brabandt --- runtime/doc/help.txt | 4 +- runtime/doc/sponsor.txt | 83 ++++---------------------- runtime/doc/tags | 4 +- runtime/doc/uganda.txt | 101 ++++++++++++-------------------- runtime/doc/usr_01.txt | 4 +- runtime/doc/version9.txt | 7 ++- src/po/vim.pot | 4 +- src/testdir/test_window_cmd.vim | 12 ++-- src/version.c | 6 +- 9 files changed, 73 insertions(+), 152 deletions(-) diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index e8f15c737a..5391d2d649 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 9.1. Last change: 2025 Jun 27 +*help.txt* For Vim version 9.1. Last change: 2025 Nov 01 VIM - main help file k @@ -44,7 +44,7 @@ BASIC: |quickref| Overview of the most common commands you will use |tutor| 30-minute interactive course for beginners |copying| About copyrights -|iccf| Helping poor children in Uganda +|Kuwasha| Helping poor children in Uganda |sponsor| Sponsor Vim development, become a registered Vim user |www| Vim on the World Wide Web |bugs| Where to send bug reports diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index 6aaa906992..4222160028 100644 --- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 9.1. Last change: 2025 Oct 12 +*sponsor.txt* For Vim version 9.1. Last change: 2025 Nov 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -22,30 +22,6 @@ For the most recent information about sponsoring look on the Vim web site: More explanations can be found in the |sponsor-faq|. -REGISTERED VIM USER *register* - -You can become a registered Vim user by sending at least 10 euro. This works -similar to sponsoring Vim, see |sponsor| above. Registration was made -possible for the situation where your boss or bookkeeper may be willing to -register software, but does not like the terms "sponsoring" and "donation". - -More explanations can be found in the |register-faq|. - - -VOTE FOR FEATURES *vote-for-features* - -Note: Voting for features has been discontinued since the passing of |Bram| in -2023. The following two links still work, but they are no longer updated. So -they now only provide a historic view as of summer 2023. - -The voting results appear on the results page, which is visible for everybody: -http://www.vim.org/sponsor/vote_results.php - -Additionally, once you have sent 100 euro or more in total, your name appears -in the "Vim hall of honour": http://www.vim.org/sponsor/hall_of_honour.php -But only if you enable this on your account page. - - HOW TO SEND MONEY *send-money* Credit card Through PayPal, see the PayPal site for information: @@ -58,77 +34,45 @@ Credit card Through PayPal, see the PayPal site for information: In Euro countries a bank transfer is preferred, this has lower costs. -Other methods See |iccf-donations|. +Other methods See |donate|. Include "Vim sponsor" or "Vim registration" in the comment of your money transfer. QUESTIONS AND ANSWERS *sponsor-faq* *register-faq* -Why should I give money? +Why should I give money?~ If you do not show your appreciation for Vim, the development team will be less motivated to fix bugs and add new features. They will do something else instead. -How much money should I send? +How much money should I send?~ That is up to you. The more you give, the more children will be helped. An indication for individuals that use Vim at home: 10 Euro per year. For professional use: 30 Euro per year per person. -How do I become a Vim sponsor or registered Vim user? - -Send money, as explained above |send-money| and include your e-mail address. -When the money has been received you will receive a unique registration key. -This key can be used on the Vim website to get an extra page where you can -choose whether others will be able to see that you donated. There is a link -to this page on your "My Account" page. - - -What is the difference between sponsoring and registering? - -It has a different name. Use the term "registration" if your boss doesn't -like "sponsoring" or "donation". The benefits are the same. - - -How can I send money? +How can I send money?~ See |send-money|. Check the web site for the most recent information: http://www.vim.org/sponsor/ -Why don't you use the SourceForge donation system? - -SourceForge takes 5% of the donations for themselves. If you want to support -SourceForge you can send money to them directly. - - -I cannot afford to send money, may I still use Vim? - -Yes. - - -I did not register Vim, can I use all available features? +I cannot afford to send money, may I still use Vim?~ Yes. -I noticed a bug, do I need to register before I can report it? - -No, suggestions for improving Vim can always be given. For improvements use -the developer |maillist|, for reporting bugs see |bugs|. - - -How about Charityware? +How about Charityware?~ Currently the Vim donations go to |uganda| anyway. Thus it doesn't matter if -you sponsor Vim or ICCF. +you sponsor Vim or Kuwasha. -I donated $$$, now please add feature XYZ! +I donated $$$, now please add feature XYZ!~ There is no direct relation between your donation and the work developers do. Otherwise you would be paying for work and we would have to pay tax over the @@ -136,15 +80,12 @@ donation. If you want to hire one of the developers for specific work, contact them directly, don't use the donation system. -Are the donations tax deductible? +Are the donations tax deductible?~ -That depends on your country. The donations to help the children in |Uganda| -are tax deductible in Holland, Germany, Canada and in the USA. See the ICCF -website https://iccf-holland.org/donate.html (Note: this process is currently -undergoing some changes and will be done differently in the future). +Possibly. Please refer to |Kuwasha| for this question. -Can you send me a bill? +Can you send me a bill?~ No, because there is no relation between the money you send and the work that is done. But a receipt is possible. diff --git a/runtime/doc/tags b/runtime/doc/tags index 3a35834216..8fd8cbae16 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5739,6 +5739,7 @@ KVim gui_x11.txt /*KVim* KeyInputPre autocmd.txt /*KeyInputPre* Kibaale uganda.txt /*Kibaale* Korean mbyte.txt /*Korean* +Kuwasha uganda.txt /*Kuwasha* L motion.txt /*L* Linux-backspace options.txt /*Linux-backspace* List eval.txt /*List* @@ -8598,7 +8599,6 @@ i` motion.txt /*i`* ia64.vim syntax.txt /*ia64.vim* ib motion.txt /*ib* iccf uganda.txt /*iccf* -iccf-donations uganda.txt /*iccf-donations* icon-changed version4.txt /*icon-changed* iconise starting.txt /*iconise* iconize starting.txt /*iconize* @@ -10023,7 +10023,6 @@ reg_executing() builtin.txt /*reg_executing()* reg_recording() builtin.txt /*reg_recording()* regexp pattern.txt /*regexp* regexp-changes-5.4 version5.txt /*regexp-changes-5.4* -register sponsor.txt /*register* register-faq sponsor.txt /*register-faq* register-functions usr_41.txt /*register-functions* register-variable eval.txt /*register-variable* @@ -11707,7 +11706,6 @@ vms-notes os_vms.txt /*vms-notes* vms-problems os_vms.txt /*vms-problems* vms-started os_vms.txt /*vms-started* vms-usage os_vms.txt /*vms-usage* -vote-for-features sponsor.txt /*vote-for-features* votes-for-changes todo.txt /*votes-for-changes* vreplace-mode insert.txt /*vreplace-mode* vt100-cursor-keys term.txt /*vt100-cursor-keys* diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt index 1abc2bd3ea..47ae640e52 100644 --- a/runtime/doc/uganda.txt +++ b/runtime/doc/uganda.txt @@ -1,4 +1,4 @@ -*uganda.txt* For Vim version 9.1. Last change: 2025 Aug 10 +*uganda.txt* For Vim version 9.1. Last change: 2025 Nov 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -6,18 +6,30 @@ *uganda* *Uganda* *copying* *copyright* *license* SUMMARY - *iccf* *ICCF* + *Kuwasha* Vim is Charityware. You can use and copy it as much as you like, but you are encouraged to make a donation for needy children in Uganda. Please see |kcc| -below or visit the ICCF web site, available at these URLs: +below or visit the Kuwasha web site, available at the following URL: - https://iccf-holland.org/ - https://www.vim.org/iccf/ - https://www.iccf.nl/ + https://www.kuwasha.net You can also sponsor the development of Vim, see |sponsor|. The money goes to Uganda anyway. + *iccf* *ICCF* +ICCF Holland and Kuwasha~ + +|Bram| Moolenaar's charity, ICCF Holland, has long supported the education of +children in Uganda through the Kibaale Children's Centre. Following Bram's +passing in 2023, ICCF Holland transfered all activities to its sister charity +Kuwasha in Canada and dissolved at the end of 2025. + +Donations from Vim users are still welcome and will continue to go directly to +Uganda. To continue supporting this cause, please send contributions to +Kuwasha. + +License~ + The Open Publication License applies to the Vim documentation, see |manual-copyright|. @@ -185,84 +197,43 @@ medical help. Since 2020 a maternity ward was added and 24/7 service is available. When needed, transport to a hospital is offered. Immunization programs are carried out and help is provided when an epidemic is breaking out (measles and cholera have been a problem). - *donate* -Summer 1994 to summer 1995 I spent a whole year at the centre, working as a -volunteer. I have helped to expand the centre and worked in the area of water -and sanitation. I learned that the help that the KCC provides really helps. -When I came back to Holland, I wanted to continue supporting KCC. To do this -I'm raising funds and organizing the sponsorship program. Please consider one -of these possibilities: - -1. Sponsor a child in primary school: 17 euro a month (or more). -2. Sponsor a child in secondary school: 25 euro a month (or more). -3. Sponsor the clinic: Any amount a month or quarter -4. A one-time donation - -Compared with other organizations that do child sponsorship the amounts are -very low. This is because the money goes directly to the centre. Less than -5% is used for administration. This is possible because this is a small -organization that works with volunteers. If you would like to sponsor a -child, you should have the intention to do this for at least one year. - -How do you know that the money will be spent right? First of all you have my -personal guarantee as the author of Vim. I trust the people that are working -at the centre, I know them personally. Furthermore, the centre has been + +Summer 1994 to summer 1995 Bram spent a whole year at the centre, working as a +volunteer. Bram helped to expand the centre and worked in the area of water +and sanitation. Bram learned that the help that the KCC provides really +helps. When Bram came back to Holland, he wanted to continue supporting KCC. +To do this he has been raising funds and organizing the sponsorship program. + +How do you know that the money will be spent right? First of all you have the +personal guarantee of Bram as the author of Vim, who knew the people working +at the centre personally. Furthermore, the centre has been co-sponsored and inspected by World Vision, Save the Children Fund and is now -under the supervision of Pacific Academy Outreach Society. The centre is -visited about once a year to check the progress (at our own cost). I have -visited the centre myself many times, starting in 1993. The visit reports are -on the ICCF web site. +under the supervision of Pacific Academy Outreach Society. Bram has +visited the centre many times, starting in 1993. The visit reports are +have been shared on the ICCF web site (may no longer be available). -If you have any further questions, send e-mail: . +If you have any further questions, send an e-mail: info@kuwasha.net. The address of the centre is: Kibaale Children's Centre p.o. box 1658 Masaka, Uganda, East Africa -Sending money: *iccf-donations* - -Check the ICCF web site for the latest information! See |iccf| for the URL. - + *donate* +Sending money: -USA: The methods mentioned below can be used. - If you must send a check send it to our Canadian partner: - https://www.kuwasha.net/ +Check the Kuwasha web site for the latest information! -Canada: Contact Kuwasha in Surrey, Canada. They take care of the - Canadian sponsors for the children in Kibaale. Kuwasha - forwards 100% of the money to the project in Uganda. You can - send them a one time donation directly. Look on their site for information about sponsorship: https://www.kuwasha.net/ If you make a donation to Kuwasha you will receive a tax receipt which can be submitted with your tax return. -Holland: Transfer to the account of "Stichting ICCF Holland" in - Amersfoort. This will allow for tax deduction if you live in - Holland. ING bank, IBAN: NL95 INGB 0004 5487 74 - -Germany: It is possible to make donations that allow for a tax return. - Check the ICCF web site for the latest information: - https://iccf-holland.org/germany.html - -Europe: Use a bank transfer if possible. See "Others" below for the - swift code and IBAN number. - Any other method should work. Ask for information about - sponsorship. - Credit Card: You can use PayPal to send money with a Credit card. This is the most widely used Internet based payment system. It's really simple to use. Use this link to find more info: https://www.paypal.com/en_US/mrb/pal=XAC62PML3GF8Q The e-mail address for sending the money to is: - Bram@iccf-holland.org - -Others: Transfer to this account if possible: - ING bank: IBAN: NL95 INGB 0004 5487 74 - Swift code: INGBNL2A - under the name "stichting ICCF Holland", Amersfoort - Checks are not accepted. - + info@kuwasha.net vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt index 88d4913690..2f6f42b971 100644 --- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -1,4 +1,4 @@ -*usr_01.txt* For Vim version 9.1. Last change: 2025 Oct 26 +*usr_01.txt* For Vim version 9.1. Last change: 2025 Nov 01 VIM USER MANUAL by Bram Moolenaar @@ -191,7 +191,7 @@ manual. Not only by providing literal text, but also by setting the tone and style. If you make money through selling the manuals, you are strongly encouraged to -donate part of the profit to help AIDS victims in Uganda. See |iccf|. +donate part of the profit to help AIDS victims in Uganda. See |Kuwasha|. ============================================================================== diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt index 23f4bed554..344a55e012 100644 --- a/runtime/doc/version9.txt +++ b/runtime/doc/version9.txt @@ -52,7 +52,7 @@ remember him! Vim version 9.1 is dedicated to Bram Moolenaar, who passed away on August 3rd 2023 while still working full-time on Vim. The Vim project would not exist without his ongoing passion to lead and develop Vim and the community for more -than 30 years. Bram was also passionate about his |ICCF| foundation to help +than 30 years. Bram was also passionate about his ICCF foundation to help children in Uganda. If you enjoy using Vim, please consider donating! We will miss his guidance, passion and leadership. @@ -41783,6 +41783,11 @@ Others: ~ - Vim triggers the |TermResponseAll| autocommand for any terminal OSC value. - Support CTRL-B and CTRL-F in the |more-prompt|. + +Not Vim related~ +- Updated sponsorship documentation to replace references to ICCF with Kuwasha + International Development Society as Vim's designated charity. + *added-9.2* Added ~ ----- diff --git a/src/po/vim.pot b/src/po/vim.pot index ac1fe9a090..ddac4a3638 100644 --- a/src/po/vim.pot +++ b/src/po/vim.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Vim\n" "Report-Msgid-Bugs-To: vim-dev@vim.org\n" -"POT-Creation-Date: 2025-10-31 09:13+0000\n" +"POT-Creation-Date: 2025-11-01 16:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3546,7 +3546,7 @@ msgstr "" msgid "Help poor children in Uganda!" msgstr "" -msgid "type :help iccf for information " +msgid "type :help Kuwasha for information " msgstr "" msgid "type :q to exit " diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index c19d39fbf7..2841a31278 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -114,6 +114,7 @@ func Test_window_cmd_wincmd_gf() new | only! augroup! test_window_cmd_wincmd_gf + bw! endfunc func Test_window_quit() @@ -596,14 +597,14 @@ func Test_window_jump_tag() CheckFeature quickfix help - /iccf - call assert_match('^|iccf|', getline('.')) + /Kuwasha + call assert_match('^|Kuwasha|', getline('.')) call assert_equal(2, winnr('$')) 2wincmd } call assert_equal(3, winnr('$')) - call assert_match('^|iccf|', getline('.')) + call assert_match('^|Kuwasha|', getline('.')) wincmd k - call assert_match('\*iccf\*', getline('.')) + call assert_match('\*Kuwasha\*', getline('.')) call assert_equal(2, winheight(0)) wincmd z @@ -823,6 +824,7 @@ func Test_window_prevwin() q set hidden&vim autoread&vim delfunc Fun_RenewFile + bw! endfunc func Test_relative_cursor_position_in_one_line_window() @@ -2117,6 +2119,7 @@ func Test_splitkeep_skipcol() let buf = RunVimInTerminal('-S XTestSplitkeepSkipcol', #{rows: 12, cols: 40}) call VerifyScreenDump(buf, 'Test_splitkeep_skipcol_1', {}) + call StopVimInTerminal(buf) endfunc func Test_splitkeep_line() @@ -2135,6 +2138,7 @@ func Test_splitkeep_line() call term_sendkeys(buf, ":wincmd s\") call VerifyScreenDump(buf, 'Test_splitkeep_line_2', {}) + call StopVimInTerminal(buf) endfunc func Test_new_help_window_on_error() diff --git a/src/version.c b/src/version.c index ff8121c4fd..e6dd363c53 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1893, /**/ 1892, /**/ @@ -5029,7 +5031,7 @@ intro_message( N_("Vim is open source and freely distributable"), "", N_("Help poor children in Uganda!"), - N_("type :help iccf for information "), + N_("type :help Kuwasha for information "), "", N_("type :q to exit "), N_("type :help or for on-line help"), @@ -5105,7 +5107,7 @@ intro_message( p = sponsor < 0 ? N_("Sponsor Vim development!") : N_("Become a registered Vim user!"); - else if (strstr(p, "iccf") != NULL) + else if (strstr(p, "Kuwasha") != NULL) p = sponsor < 0 ? N_("type :help sponsor for information ") : N_("type :help register for information "); -- 2.47.3