- manpaged md5 fix

[packages/vim.git] / 6.2.191

To: vim-dev@vim.org
Subject: Patch 6.2.191
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.2.191
Problem:    The intro message is outdated.  Information about sponsoring and
	    registering is missing.
Solution:   Show info about sponsoring and registering Vim in the intro
	    message now and then.  Add help file about sponsoring.
Files:	    runtime/doc/help.txt, runtime/doc/sponsor.txt, runtime/doc/tags,
	    runtime/menu.vim, src/version.c


*** ../vim-6.2.190/runtime/doc/help.txt	Sun Jun  1 12:20:32 2003
--- runtime/doc/help.txt	Sun Jan 18 21:16:07 2004
***************
*** 1,4 ****
! *help.txt*	For Vim version 6.2.  Last change: 2003 May 11
  
  			VIM - main help file
  									 k
--- 1,4 ----
! *help.txt*	For Vim version 6.2.  Last change: 2004 Jan 08
  
  			VIM - main help file
  									 k
***************
*** 36,41 ****
--- 36,42 ----
  |tutor|		30 minutes training course for beginners
  |copying|	About copyrights
  |iccf|		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
  
*** ../vim-6.2.190/runtime/doc/sponsor.txt	Sun Jan 18 21:14:50 2004
--- runtime/doc/sponsor.txt	Thu Jan 15 10:03:22 2004
***************
*** 0 ****
--- 1,228 ----
+ *sponsor.txt*   For Vim version 6.2.  Last change: 2004 Jan 15
+ 
+ 
+ 		  VIM REFERENCE MANUAL    by Bram Moolenaar
+ 
+ 
+ 
+ SPONSOR VIM DEVELOPMENT						*sponsor*
+ 
+ Fixing bugs and adding new features takes a lot of effort.  For a few years
+ Bram has attempted to do this next to a full-time job.  During that time the
+ todo list kept getting longer and longer.
+ 
+ In order for Bram to support Vim properly he needs your support.  Through your
+ donations Bram will be able to have a part-time job and spend more time on
+ fixing bugs and adding new features.
+ 
+ For the most recent information about sponsoring look on the Vim web site:
+ 
+ 	http://www.vim.org/sponsor/
+ 
+ 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*
+ 
+ To give registered Vim users and sponsors an advantage over lurkers they can
+ vote for the items Bram should work on.  How does this voting work?
+ 
+ 1.  You send at least 10 euro.  See below for ways to transfer money
+     |send-money|.
+ 
+ 2.  You will be e-mailed a registration key.  Enter this key on your account
+     page on the Vim website.  You can easily create an account if you don't
+     have one yet.
+ 
+ 3.  You can enter your votes on the voting page.  There is a link to that page
+     on your account page after entering a registration key.  Your votes will
+     be counted for two years.
+ 
+ 4.  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 send 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*
+ 
+ Creditcard     	Through PayPal, see the PayPal site for information:
+ 			https://www.paypal.com
+ 		The e-mail address for sending sponsorship money is:
+ 			donate@vim.org
+ 		The e-mail address for Vim registration is:
+ 			register@vim.org
+ 		Using Euro is preferred, other currencies are also accepted.
+ 		In Europe a bank transfer is preferred, this has lower costs.
+ 
+ Bank transfer	Transfer to Bram's account at the Postbank: 1644503.  For
+ 		international transfers you can use these numbers:
+      			IBAN:       NL79 PSTB 0001 6445 03
+ 			SWIFT/BIC:  PSTBNL21
+ 		This is the address of the bank:    	
+ 			ING Bank Amsterdam, Foreign Operations
+ 			PO Box 1800
+ 			1000 BV Amsterdam
+ 			The Netherlands
+ 		Include your e-mail address in the comment of your money
+ 		transfer if you want to vote for features and show others you
+ 		are a registered Vim user or sponsor.
+ 
+ Cash		Small amounts can be send with ordinary mail.  Put something
+ 		around the money, so that it's not noticable from the outside.
+ 		Mention your e-mail address if you want to vote for features
+ 		and show others you are a registered Vim user or sponsor.
+ 
+ This is Bram's address:    	
+ 	Bram Moolenaar
+ 	Clematisstraat 30
+ 	5925 BE Venlo
+ 	The Netherlands
+ 
+ 
+ ALTERNATIVE
+ 
+ If you don't care about sponsoring Vim Development or becoming a registered
+ Vim user, but do care about helping needy children, consider giving to the
+ ICCF Holland foundation.  This is the charity recommended by Vim's author.
+ The money is used for a children centre in the south of Uganda, where AIDS has
+ caused many victims.  See |uganda|.
+ 
+ 
+ QUESTIONS AND ANSWERS				*sponsor-faq* *register-faq*
+ 
+ Why should I give money?
+ 
+ Bram has tried to work on Vim next to a full-time job.  The list of known bugs
+ and ideas for new features has constantly been growing during this time.  Bram
+ simply can't spend enough time on Vim development when he has a full-time job.
+ Your contribution will make it possible for Bram to have a part-time job and
+ spend much more time on Vim development.  Bugs will be fixed quicker and new
+ Vim releases will become available more often.
+ 
+ 
+ How much money should I send?
+ 
+ That is up to you.  The more you give, the more time Bram can work on Vim.  An
+ indication for individuals that use Vim at home: 10 Euro per year.  For
+ professional use: 30 Euro per year per person.  Send at least 10 euro to be
+ able to vote for features.
+ 
+ 
+ What do I get in return?
+ 
+ Each registered Vim user and sponsor who donates at least 10 euro will be able
+ to vote for new features.  These votes will give priority to the work on Vim.
+ The votes are valid for two years.  The more money you send the more your
+ votes count |votes-counted|.
+ 
+ If you send 100 Euro or more in total you will be mentioned on the "Vim hall
+ of honour" page on the Vim web site.  But only if you enable this on your
+ account page.  You can also select whether the amount will be visible.
+ 
+ 
+ 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 activate voting on your Vim
+ account.  You will then get an extra page where you can vote for features and
+ 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?
+ 
+ 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?
+ 
+ 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 are my votes counted?				*votes-counted*
+ 
+ You may vote when you send 10 euro or more.  You can enter up to ten votes.
+ You can select the same item several times to give it more points.  You can
+ also enter three counter votes, these count as negative points.
+ 
+ When you send 30 euro or more the points are doubled.  Above 100 euro they
+ count four times, above 300 euro they count six times, above 1000 euro ten
+ times.
+ 
+ 
+ Can I change my votes?
+ 
+ You can change your votes any time you like, up to two years after you
+ sent money.  The points will be counted right away.
+ 
+ 
+ How about Charityware?
+ 
+ You have to decide yourself whether you want to sponsor Vim development, help
+ the poor children in Uganda (see |uganda|) or both.  Bram will certainly keep
+ on supporting the project in Uganda.  In the (unlikely) situation that Bram
+ gets more donations for Vim development than he needs, he will send the money
+ to Uganda.
+ 
+ 
+ I donated $$$, now please add feature XYZ!
+ 
+ There is no direct relation between your donation and the work Bram does.
+ Otherwise you would be paying for work and Bram has to pay income tax over the
+ donation.  If you want to hire Bram for specific work, contact him directly,
+ don't use the donation system.
+ 
+ 
+ Are the donations tax deductable?
+ 
+ No.  Setting up a system for this is complex and imposes too many restrictions.
+ The donations to help the children in |Uganda| are tax deductable in Holland,
+ Germany, Canada and probably also in the USA.
+ 
+ 
+ Can you send me a bill?
+ 
+ Sending a bill would mean Bram does something in return for your contribution.
+ That is work and would mean Bram has to pay income tax over the amount.  It is
+ possible, but the net amount will be lower.
+ 
+ 
+  vim:tw=78:ts=8:ft=help:norl:
*** ../vim-6.2.190/runtime/doc/tags	Mon Jun  2 21:31:14 2003
--- runtime/doc/tags	Fri Jan 16 15:26:10 2004
***************
*** 1924,1929 ****
--- 1949,1956 ----
  :ju	motion.txt	/*:ju*
  :jumps	motion.txt	/*:jumps*
  :k	motion.txt	/*:k*
+ :kee	motion.txt	/*:kee*
+ :keepmarks	motion.txt	/*:keepmarks*
  :l	various.txt	/*:l*
  :la	editing.txt	/*:la*
  :lan	mlang.txt	/*:lan*
***************
*** 1956,1961 ****
--- 1984,1991 ----
  :loadk	mbyte.txt	/*:loadk*
  :loadkeymap	mbyte.txt	/*:loadkeymap*
  :loadview	starting.txt	/*:loadview*
+ :loc	motion.txt	/*:loc*
+ :lockmarks	motion.txt	/*:lockmarks*
  :ls	windows.txt	/*:ls*
  :lu	map.txt	/*:lu*
  :lunmap	map.txt	/*:lunmap*
***************
*** 5508,5513 ****
--- 5559,5566 ----
  reference	intro.txt	/*reference*
  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-variable	eval.txt	/*register-variable*
  registers	change.txt	/*registers*
  regular-expression	pattern.txt	/*regular-expression*
***************
*** 5619,5624 ****
--- 5673,5679 ----
  section	motion.txt	/*section*
  sed-syntax	syntax.txt	/*sed-syntax*
  sed.vim	syntax.txt	/*sed.vim*
+ send-money	sponsor.txt	/*send-money*
  send-to-menu	gui_w32.txt	/*send-to-menu*
  sendto	gui_w32.txt	/*sendto*
  sentence	motion.txt	/*sentence*
***************
*** 5667,5672 ****
--- 5723,5731 ----
  speed-up	tips.txt	/*speed-up*
  splitfind	windows.txt	/*splitfind*
  splitview	windows.txt	/*splitview*
+ sponsor	sponsor.txt	/*sponsor*
+ sponsor-faq	sponsor.txt	/*sponsor-faq*
+ sponsor.txt	sponsor.txt	/*sponsor.txt*
  spoon	os_unix.txt	/*spoon*
  spup-syntax	syntax.txt	/*spup-syntax*
  spup.vim	syntax.txt	/*spup.vim*
***************
*** 6271,6276 ****
--- 6331,6338 ----
  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-counted	sponsor.txt	/*votes-counted*
  votes-for-changes	todo.txt	/*votes-for-changes*
  vreplace-mode	insert.txt	/*vreplace-mode*
  vt100-cursor-keys	term.txt	/*vt100-cursor-keys*
***************
*** 6460,6465 ****
--- 6522,6528 ----
  {motion}	intro.txt	/*{motion}*
  {move-around}	visual.txt	/*{move-around}*
  {offset}	pattern.txt	/*{offset}*
+ {pat}	autocmd.txt	/*{pat}*
  {rhs}	map.txt	/*{rhs}*
  {subject}	various.txt	/*{subject}*
  {}	intro.txt	/*{}*
*** ../vim-6.2.190/runtime/menu.vim	Sun Oct 12 17:00:32 2003
--- runtime/menu.vim	Thu Jan  8 21:38:19 2004
***************
*** 2,8 ****
  " You can also use this as a start for your own set of menus.
  "
  " Maintainer:	Bram Moolenaar <Bram@vim.org>
! " Last Change:	2003 Set 20
  
  " Note that ":an" (short for ":anoremenu") is often used to make a menu work
  " in all modes and avoid side effects from mappings defined by the user.
--- 2,8 ----
  " You can also use this as a start for your own set of menus.
  "
  " Maintainer:	Bram Moolenaar <Bram@vim.org>
! " Last Change:	2004 Jan 08
  
  " Note that ":an" (short for ":anoremenu") is often used to make a menu work
  " in all modes and avoid side effects from mappings defined by the user.
***************
*** 66,71 ****
--- 66,72 ----
  an 9999.45 &Help.-sep1-			<Nop>
  an 9999.50 &Help.&Credits		:help credits<CR>
  an 9999.60 &Help.Co&pying		:help copying<CR>
+ an 9999.70 &Help.&Sponsor/Register	:help sponsor<CR>
  an 9999.70 &Help.O&rphans		:help kcc<CR>
  an 9999.75 &Help.-sep2-			<Nop>
  an 9999.80 &Help.&Version		:version<CR>
*** ../vim-6.2.190/src/version.c	Sun Jan 18 21:12:26 2004
--- src/version.c	Sun Jan 18 21:13:45 2004
***************
*** 1377,1382 ****
--- 1379,1385 ----
      int		i;
      int		row;
      int		blanklines;
+     int		sponsor;
      char	*p;
      static char	*(lines[]) =
      {
***************
*** 1444,1449 ****
--- 1447,1457 ----
      if (blanklines < 0)
  	blanklines = 0;
  
+     /* Show the sponsor and register message one out of four times, the Uganda
+      * message two out of four times. */
+     sponsor = time(NULL);
+     sponsor = ((sponsor & 2) == 0) - ((sponsor & 4) == 0);
+ 
      /* start displaying the message lines after half of the blank lines */
      row = blanklines / 2;
      if ((row >= 2 && Columns >= 50) || colon)
***************
*** 1460,1465 ****
--- 1468,1486 ----
  		if (!p_cp)
  		    break;
  		continue;
+ 	    }
+ 	    if (sponsor != 0)
+ 	    {
+ 		if (strstr(p, "children") != NULL)
+ 		    p = sponsor < 0
+ 			? N_("Sponsor Vim development!")
+ 			: N_("Become a registered Vim user!");
+ 		else if (strstr(p, "iccf") != NULL)
+ 		    p = sponsor < 0
+ 			? N_("type  :help sponsor<Enter>    for information ")
+ 			: N_("type  :help register<Enter>   for information ");
+ 		else if (strstr(p, "Orphans") != NULL)
+ 		    p = N_("menu  Help->Sponsor/Register  for information    ");
  	    }
  	    if (*p != NUL)
  		do_intro_line(row, (char_u *)_(p), i == 2, 0);
*** ../vim-6.2.190/src/version.c	Sun Jan 18 21:12:26 2004
--- src/version.c	Sun Jan 18 21:13:45 2004
***************
*** 639,640 ****
--- 639,642 ----
  {   /* Add new patch number below this line */
+ /**/
+     191,
  /**/

-- 
Vim is like Emacs without all the typing.  (John "Johann" Spetz)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///