diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index da979d1..c0cbf2b 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Apr 24
+" Last Change:	2006 Oct 10
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -608,7 +608,7 @@
       call append("$", " \tset bexpr=" . &bexpr)
     endif
   endif
-  if exists("&macatsui")
+  if exists("+macatsui")
     call append("$", "macatsui\tuse ATSUI text drawing; disable to avoid display problems")
     call <SID>OptionG("macatsui", &macatsui)
   endif
@@ -1212,8 +1212,14 @@
 call <SID>BinOptionG("gd", &gd)
 call append("$", "edcompatible\t'g' and 'c' flags of \":substitute\" toggle")
 call <SID>BinOptionG("ed", &ed)
+if exists("+opendevice")
+  call append("$", "opendevice\tallow reading/writing devices")
+  call <SID>BinOptionG("odev", &odev)
+endif
+if exists("+maxfuncdepth")
   call append("$", "maxfuncdepth\tmaximum depth of function calls")
   call append("$", " \tset mfd=" . &mfd)
+endif
 if has("mksession")
   call append("$", "sessionoptions\tlist of words that specifies what to put in a session file")
   call <SID>OptionG("ssop", &ssop)