[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2.148-156-g41bdd90

[James Vega]

The following commit has been merged in the deb/runtime branch:
commit 0a55f761b749b561852e3c43354222a5d2953abe
Merge: c7f25932511975b4596f61ee58af3291d6f641d6 3abb10cc7a6455e01e31413250d0fff1d7ad849b
Author: James Vega <jamessan at debian.org>
Date:   Tue Jun 16 18:54:14 2009 -0400

    Merge branch 'upstream-runtime' into deb/runtime

diff --combined runtime/doc/options.txt
index ced2841,c8c3a36..d0aaf1d
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@@ -1444,6 -1444,14 +1444,14 @@@ A jump table for the options with a sho
  	autoselectml	Like "autoselect", but for the modeless selection
  			only.  Compare to the 'A' flag in 'guioptions'.
  
+ 	html		When the clipboard contains HTML, use this when
+ 			pasting.  When putting text on the clipboard, mark it
+ 			as HTML.  This works to copy rendered HTML from
+ 			Firefox, paste it as raw HTML in Vim, select the HTML
+ 			in Vim and paste it in a rich edit box in Firefox.
+ 			Only supported for GTK version 2 and later.
+ 			Only available with the |+multi_byte| feature.
+ 
  	exclude:{pattern}
  			Defines a pattern that is matched against the name of
  			the terminal 'term'.  If there is a match, no
@@@ -4607,7 -4615,7 +4615,7 @@@
  
  				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
  'modeline' 'ml'		boolean	(Vim default: on (off for root),
 -				 Vi default: off)
 +				 Debian: off, Vi default: off)
  			local to buffer
  						*'modelines'* *'mls'*
  'modelines' 'mls'	number	(default 5)

-- 
Vim packaging