diff -rc vim_hg_2577/runtime/autoload/tohtml.vim vimnew/autoload/tohtml.vim
*** vim_hg_2577/runtime/autoload/tohtml.vim	Mon Aug 23 18:06:09 2010
--- vimnew/autoload/tohtml.vim	Thu Aug 26 11:24:15 2010
***************
*** 336,342 ****
      if exists("g:html_use_encoding")
        let user_settings.encoding = g:html_use_encoding
      else
!       let vim_encoding = &encoding
        if vim_encoding =~ '^8bit\|^2byte'
  	let vim_encoding = substitute(vim_encoding, '^8bit-\|^2byte-', '', '')
        endif
--- 336,342 ----
      if exists("g:html_use_encoding")
        let user_settings.encoding = g:html_use_encoding
      else
!       let vim_encoding = &fileencoding
        if vim_encoding =~ '^8bit\|^2byte'
  	let vim_encoding = substitute(vim_encoding, '^8bit-\|^2byte-', '', '')
        endif
diff -rc vim_hg_2577/runtime/doc/syntax.txt vimnew/doc/syntax.txt
*** vim_hg_2577/runtime/doc/syntax.txt	Mon Aug 23 18:06:17 2010
--- vimnew/doc/syntax.txt	Thu Aug 26 11:24:06 2010
***************
*** 475,484 ****
  This will use <br> at the end of each line and use "&nbsp;" for repeated
  spaces.
  
! The current value of 'encoding' is used to specify the charset of the HTML
! file.  This only works for those values of 'encoding' that have an equivalent
! HTML charset name.  To overrule this set g:html_use_encoding to the name of
! the charset to be used: >
     :let g:html_use_encoding = "foobar"
  To omit the line that specifies the charset, set g:html_use_encoding to an
  empty string: >
--- 475,484 ----
  This will use <br> at the end of each line and use "&nbsp;" for repeated
  spaces.
  
! The current value of 'fileencoding' is used to specify the charset of the HTML
! file.  This only works for those values of 'fileencoding' that have an 
! equivalent HTML charset name.  To overrule this set g:html_use_encoding to the 
! name of the charset to be used: >
     :let g:html_use_encoding = "foobar"
  To omit the line that specifies the charset, set g:html_use_encoding to an
  empty string: >