diff --git a/runtime/ftplugin/icon.vim b/runtime/ftplugin/icon.vim
index 33a86df..10411c8 100644
--- a/runtime/ftplugin/icon.vim
+++ b/runtime/ftplugin/icon.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Icon
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2022 Jun 16
+" Last Change:	2024 Jan 14
 
 if exists("b:did_ftplugin")
   finish
@@ -18,15 +18,19 @@
 let b:undo_ftplugin = "setl fo< com< cms<"
 
 if exists("loaded_matchit")
-    " let b:match_ignorecase = 0
-    let b:match_words  = '^\s*$\s*if\(def\|ndef\)\=\>:^\s*$\s*elif\>:^\s*$\s*else\>:^\s*$\s*endif\>,' .
+    let b:match_ignorecase = 0
+    let b:match_words  = '^\s*$\s*if\(def\|ndef\)\=\>:^\s*$\s*elif\>:^\s*$\s*else\>:^\s*$\s*endif\>,' ..
 	  \		 '\<procedure\>:\<\%(initial\|return\|suspend\|fail\)\>:\<end\>'
-    let b:undo_ftplugin ..= " | unlet! b:match_words"
+    let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words"
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Icon Source Files (*.icn)\t*.icn\n" .
-	\	       "All Files (*.*)\t*.*\n"
+  let b:browsefilter = "Icon Source Files (*.icn)\t*.icn\n"
+  if has("win32")
+    let b:browsefilter ..= "All Files (*.*)\t*\n"
+  else
+    let b:browsefilter ..= "All Files (*)\t*\n"
+  endif
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif