22 files changed, 30 insertions, 26 deletions
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index 8227c8f3..752f5bc3 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -16,7 +16,7 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal softtabstop=4 shiftwidth=4 encoding=utf-8
+setlocal softtabstop=4 shiftwidth=4
 setlocal suffixesadd=.fal,.ftd
 
 " Matchit support
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index c9b88e1b..10ca4920 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -524,7 +524,7 @@ endfunction
   "c. link this stuff with what the user wants
   " ie. get the expression selected/under the cursor
 
-    let s:ocaml_word_char = '\w|[À-ÿ]|'''
+    let s:ocaml_word_char = '\w|[\u00ac-\uffff]|'''
 
       "In:  the current mode (eg. "visual", "normal", etc.)
       "Out: the borders of the expression we are looking for the type
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index cc24fffd..bfefa15a 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim filetype plugin file
 " Language:     RPL/2
-" Maintainer:   Joël BERTRAND <rpl2@free.fr>
+" Maintainer:   JoÃ«l BERTRAND <rpl2@free.fr>
 " Last Change:	2012 Mar 07
 " Version: 		0.1
 
diff --git a/indent/rpl.vim b/indent/rpl.vim
index 190a8335..bc4420b5 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 " Language:	RPL/2
 " Version:	0.2
 " Last Change:	2017 Jun 13
-" Maintainer:	BERTRAND Joël <rpl2@free.fr>
+" Maintainer:	BERTRAND JoÃ«l <rpl2@free.fr>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/indent/tilde.vim b/indent/tilde.vim
index e23c9806..4d5fdf30 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,7 +1,7 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 
 "Description: Indent scheme for the tilde weblanguage
-"Author: Tobias Rundström <tobi@tobi.nu>
+"Author: Tobias RundstrÃ¶m <tobi@tobi.nu>
 "URL: http://tilde.tildesoftware.net
 "Last Change: May  8 09:15:09 CEST 2002
 
diff --git a/scripts/build b/scripts/build
index 8f46b217..573a8891 100755
--- a/scripts/build
+++ b/scripts/build
@@ -275,10 +275,14 @@ def copy_file(package, src, dest)
         output << "if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '#{name}') == -1\n\n"
       end
       contents = File.read(input)
+      # fix encoding if required
+      contents.gsub!(/!@#%#/, "") rescue contents = contents.force_encoding('iso-8859-1').encode('utf-8')
       # ..= is feature of new vims...
       contents.gsub!(' ..= ', ' .= ')
       # https://github.com/vim/vim/pull/7091 
-      contents.gsub!('fileencoding=', 'encoding=')
+      contents.gsub!(/set(local)? fileencoding=utf-8/, '')
+      contents.gsub!(/ fileencoding=utf-8/, '')
+      contents.gsub!('Ã€-Ã¿', '\u00ac-\uffff')
       output << contents
       output << "\nendif\n"
     end
@@ -476,8 +480,8 @@ def extract(packages)
         globs = [package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}'))].flatten
         globs.each do |glob|
           Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
-            next unless File.file?("#{subtree}/#{p}")
-            copy_file(package, "#{subtree}/#{p}", p)
+            next unless File.file?("#{subtree}#{p}")
+            copy_file(package, "#{subtree}#{p}", p)
           end
         end
       elsif File.exist?(subpath)
diff --git a/syntax/css.vim b/syntax/css.vim
index 9aa4af3f..8cac40ec 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -63,7 +63,7 @@ syn match cssClassName "\.-\=[A-Za-z_][A-Za-z0-9_-]*" contains=cssClassNameDot
 syn match cssClassNameDot contained '\.'
 
 try
-syn match cssIdentifier "#[A-Za-zÀ-ÿ_@][A-Za-zÀ-ÿ0-9_@-]*"
+syn match cssIdentifier "#[A-Za-z\u00ac-\uffff_@][A-Za-z\u00ac-\uffff0-9_@-]*"
 catch /^.*/
 syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*"
 endtry
diff --git a/syntax/elf.vim b/syntax/elf.vim
index 5b6b9678..67063f69 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elf') == -1
 
 " Vim syntax file
 " Language:    ELF
-" Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
+" Maintainer:  Christian V. J. BrÃ¼ssow <cvjb@cvjb.de>
 " Last Change: Son 22 Jun 2003 20:43:14 CEST
 " Filenames:   *.ab,*.am
 " URL:	       http://www.cvjb.de/comp/vim/elf.vim
diff --git a/syntax/forth.vim b/syntax/forth.vim
index 0e9350ab..dbdc120a 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'forth') == -1
 " Vim syntax file
 " Language:    FORTH
 " Current Maintainer:  Johan Kotlinski <kotlinski@gmail.com>
-" Previous Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
+" Previous Maintainer:  Christian V. J. BrÃ¼ssow <cvjb@cvjb.de>
 " Last Change: 2018-03-29
 " Filenames:   *.fs,*.ft
 " URL:	       https://github.com/jkotlinski/forth.vim
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 087620c0..4fddcef3 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -12,9 +12,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 "  Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
 "  Since then, useful suggestions and contributions have been made, in order, by:
 "  Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
-"  Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman,
+"  Walter DieudonnÃ©, Alexander Wagner, Roman Bertle, Charles Rendleman,
 "  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
-"  Stefano Zaghi, Vishnu V. Krishnan, Judicaël Grasset, and Takuma Yoshida
+"  Stefano Zaghi, Vishnu V. Krishnan, JudicaÃ«l Grasset, and Takuma Yoshida
 
 if exists("b:current_syntax")
   finish
diff --git a/syntax/initng.vim b/syntax/initng.vim
index 2e1d8a45..8f8d459b 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'initng') == -1
 
 " Vim syntax file
 " Language:	initng .i files
-" Maintainer:	Elan Ruusamäe <glen@pld-linux.org>
+" Maintainer:	Elan RuusamÃ¤e <glen@pld-linux.org>
 " URL:		http://glen.alkohol.ee/pld/initng/
 " License:	GPL v2
 " Version:	0.13
diff --git a/syntax/iss.vim b/syntax/iss.vim
index de0b8e86..83589612 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'iss') == -1
 " Vim syntax file
 " Language:             Inno Setup File (iss file) and My InnoSetup extension
 " Maintainer:           Jason Mills (jmills@cs.mun.ca)
-" Previous Maintainer:  Dominique Stéphan (dominique@mggen.com)
+" Previous Maintainer:  Dominique StÃ©phan (dominique@mggen.com)
 " Last Change:          2019 Sep 27
 "
 " Todo:
diff --git a/syntax/lout.vim b/syntax/lout.vim
index 872d3094..a5a254b2 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lout') == -1
 
 " Vim syntax file
 " Language:    Lout
-" Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
+" Maintainer:  Christian V. J. BrÃ¼ssow <cvjb@cvjb.de>
 " Last Change: So 12 Feb 2012 15:15:03 CET
 " Filenames:   *.lout,*.lt
 " URL:         http://www.cvjb.de/comp/vim/lout.vim
diff --git a/syntax/moo.vim b/syntax/moo.vim
index 076788e6..053d9df1 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -97,7 +97,7 @@ if exists("moo_unknown_builtin_functions")
   syn keyword mooKnownBuiltinFunction abs acos add_property add_verb asin atan binary_hash boot_player buffered_output_length callers caller_perms call_function ceil children chparent clear_property connected_players connected_seconds connection_name connection_option connection_options cos cosh create crypt ctime db_disk_size decode_binary delete_property delete_verb disassemble dump_database encode_binary equal eval exp floatstr floor flush_input force_input function_info idle_seconds index is_clear_property is_member is_player kill_task length listappend listdelete listen listeners listinsert listset log log10 match max max_object memory_usage min move notify object_bytes open_network_connection output_delimiters parent pass players properties property_info queued_tasks queue_info raise random read recycle renumber reset_max_object resume rindex rmatch seconds_left server_log server_version setadd setremove set_connection_option set_player_flag set_property_info set_task_perms set_verb_args set_verb_code set_verb_info shutdown sin sinh sqrt strcmp string_hash strsub substitute suspend tan tanh task_id task_stack ticks_left time tofloat toint toliteral tonum toobj tostr trunc typeof unlisten valid value_bytes value_hash verbs verb_args verb_code verb_info contained
 endif
 
-" Enclosed expressions
+"Â Enclosed expressions
 syn match mooUnenclosedError display ~[')\]|}]~
 syn match mooParenthesesError display ~[';\]|}]~ contained
 syn region mooParentheses start=~(~ end=~)~ transparent contains=@mooEnclosedContents,mooParenthesesError
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index 80b94090..4aa51bec 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -14,7 +14,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'n1ql') == -1
 " Questions, comments:  <n1ql AT cime.net>
 "                       https://ciurana.eu/pgp, https://keybase.io/pr3d4t0r
 "
-" vim: set encoding=utf-8:
+" vim: :
 
 
 if exists("b:current_syntax")
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index f295c6cd..525649a8 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 
 " VIM syntax file
 " Language:	nroff/groff
-" Maintainer:	Pedro Alejandro López-Valencia <palopezv@gmail.com>
+" Maintainer:	Pedro Alejandro LÃ³pez-Valencia <palopezv@gmail.com>
 " URL:		http://vorbote.wordpress.com/
 " Last Change:	2012 Feb 2
 "
@@ -10,7 +10,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 "
 " ACKNOWLEDGEMENTS:
 "
-" My thanks to Jérôme Plût <Jerome.Plut@ens.fr>, who was the
+" My thanks to JÃ©rÃ´me PlÃ»t <Jerome.Plut@ens.fr>, who was the
 " creator and maintainer of this syntax file for several years.
 " May I be as good at it as he has been.
 "
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 90ab2abe..8e9b0f75 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 " Language:	Pascal
 " Version: 2.8
 " Last Change:	2004/10/17 17:47:30
-" Maintainer:  Xavier Crégut <xavier.cregut@enseeiht.fr>
+" Maintainer:  Xavier CrÃ©gut <xavier.cregut@enseeiht.fr>
 " Previous Maintainer:	Mario Eusebio <bio@dq.fct.unl.pt>
 
 " Contributors: Tim Chase <tchase@csc.com>,
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index f3058c7e..e3906c1c 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 " Vim syntax file
 " Language:    R noweb Files
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
-" Last Change: 2007 Mär 30
+" Last Change: 2007 MÃ¤r 30
 " Version:     0.8
 " SVN:	       $Id: rnoweb.vim 69 2007-03-30 08:55:36Z ranke $
 " Remarks:     - This file is inspired by the proposal of 
diff --git a/syntax/robots.vim b/syntax/robots.vim
index 1bd37720..724b70b9 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'robots') == -1
 " Vim syntax file
 " Language:	"Robots.txt" files
 " Robots.txt files indicate to WWW robots which parts of a web site should not be accessed.
-" Maintainer:	Dominique Stéphan (dominique@mggen.com)
+" Maintainer:	Dominique StÃ©phan (dominique@mggen.com)
 " URL: http://www.mggen.com/vim/syntax/robots.zip
 " Last change:	2001 May 09
 
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index fa052971..be71c4d5 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 " Language:	RPL/2
 " Version:	0.15.15 against RPL/2 version 4.00pre7i
 " Last Change:	2012 Feb 03 by Thilo Six
-" Maintainer:	Joël BERTRAND <rpl2@free.fr>
+" Maintainer:	JoÃ«l BERTRAND <rpl2@free.fr>
 " URL:		http://www.makalis.fr/~bertrand/rpl2/download/vim/indent/rpl.vim
 " Credits:	Nothing
 
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index d67574d2..d795c932 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -9,7 +9,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rtf') == -1
 " .hlp (windows help files) use compiled rtf files
 " rtf documentation at http://night.primate.wisc.edu/software/RTF/
 "
-" Maintainer:	Dominique Stéphan (dominique@mggen.com)
+" Maintainer:	Dominique StÃ©phan (dominique@mggen.com)
 " URL: http://www.mggen.com/vim/syntax/rtf.zip
 " Last change:	2001 Mai 02
 
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index af221da4..f31c7cdf 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 " Vim syntax file
 " This file works only for Vim6.x
 " Language:	Tilde
-" Maintainer:	Tobias Rundström <tobi@tildesoftware.net>
+" Maintainer:	Tobias RundstrÃ¶m <tobi@tildesoftware.net>
 " URL:		http://www.tildesoftware.net
 " CVS:		$Id: tilde.vim,v 1.1 2004/06/13 19:31:51 vimboss Exp $