updated to OpenBSD 5.9

3 files changed, 323 insertions, 595 deletions

diff --git a/config/obr/joe/ftyperc b/config/obr/joe/ftyperc
index 8b1d9ab..77c2230 100644
--- a/config/obr/joe/ftyperc
+++ b/config/obr/joe/ftyperc
@@ -1,123 +1,88 @@
  File Type table.  This is :included by the joerc file.
+ Scripts can look like this '#!/usr/bin/python' or this '#!   /usr/bin/env  python3'
 
+ A text file
+[text]
  No '.' in file name?  Assume it's a text file and we want wordwrap on.
 *
--wordwrap
+ Text file.
+*.txt
 
+ Not a text file
+[not_text]
  File name with '.'?  It's probably not a text file.
 *.*
+-wordwrap
 
  Diff
+[diff]
 *
++\? [A-Za-z]
++Index: [A-Za-z]
++Only in
++Nur in
 +--- 
--syntax diff
-
-*
-+*** 
--syntax diff
-
-*
-+\[1-9]\+\[0-9]\[cda]
--syntax diff
-
++\*\*\* 
++[1-9][0-9]*[cda]
 *.diff
--syntax diff
-
 *.patch
 -syntax diff
 
-*
-+Only in
--syntax diff
-
-*
-+Nur in
--syntax diff
-
-*
-+Index: \[A-Za-z]
--syntax diff
-
-*
-+? \[A-Za-z]
--syntax diff
-
  Troff
+[troff]
 *.1
--wordwrap
--syntax troff
-
 *.1.in
 -wordwrap
 -syntax troff
 
  TeX
+[tex]
 *.tex
--syntax tex
--tex_comment
--no_double_quoted
-
 *.sty
 -syntax tex
 -tex_comment
 -no_double_quoted
-
- Text file.
-*.txt
 -wordwrap
 
  News/mail files.
+[email]
 *.article*
--wordwrap
--syntax mail
-
 *.followup
--wordwrap
--syntax mail
-
 *.letter
--wordwrap
--syntax mail
-
  NN newsreader
 *tmp/nn.*
--wordwrap
--syntax mail
-
  mail
 *tmp/Re*
--wordwrap
--syntax mail
-
  elm
 *tmp/snd.*
--wordwrap
--syntax mail
-
  dmail
 *tmp/dmt*
--wordwrap
--syntax mail
-
  pine
 *tmp/pico.*
+ Mutt
+*tmp/mutt-*
 -wordwrap
 -syntax mail
 
- Assembly language
-*.asm
+ AVR assembly language
+[avr]
+*.avr
+*.inc
+-syntax avr
+-autoindent
 -wordwrap
--syntax asm
+-tab 8
 
+ Generic assembly language
+[assembly]
+*.asm
 *.s
--wordwrap
--syntax asm
-
 *.S
 -wordwrap
 -syntax asm
 
- Mason
+ Mason (Perl in HTML)
+[mason]
 *.mas
 -autoindent
 -syntax mason
@@ -125,6 +90,7 @@
 -smartbacks
 
  SML
+[sml]
 *.sml
 -autoindent
 -syntax sml
@@ -132,14 +98,9 @@
 -smartbacks
 -istep 2
 
- OCaml lanaguage file
+ OCaml
+[ocaml]
 *.ml
--autoindent
--syntax ocaml
--smarthome
--smartbacks
--istep 2
-
  OCaml language interface
 *.mli
 -autoindent
@@ -149,43 +110,14 @@
 -istep 2
 
  Ruby
+[ruby]
 *.rb
--autoindent
--pound_comment
--syntax ruby
--text_delimiters do=end
-
 *
-+#!\+\[ 	]\+\[a-z/ ]ruby\>
--autoindent
--pound_comment
--syntax ruby
--text_delimiters do=end
-
++#![ 	]*[^\n]*ruby[0-9.]*\>
 *.gemspec
--autoindent
--pound_comment
--syntax ruby
--text_delimiters do=end
-
 *Gemfile
--autoindent
--pound_comment
--syntax ruby
--text_delimiters do=end
-
 *Rakefile
--autoindent
--pound_comment
--syntax ruby
--text_delimiters do=end
-
 *Guardfile
--autoindent
--pound_comment
--syntax ruby
--text_delimiters do=end
-
 *.rabl
 -autoindent
 -pound_comment
@@ -193,31 +125,11 @@
 -text_delimiters do=end
 
  Perl
+[perl]
 *
-+#!\+\[ 	]\+\[a-z/]\[/ ]perl\>
--autoindent
--syntax perl
--smarthome
--smartbacks
--pound_comment
--single_quoted
-
++#![ 	]*[^\n]*perl[0-9.]*\>
 *.pl
--autoindent
--syntax perl
--smarthome
--smartbacks
--pound_comment
--single_quoted
-
 *.pm
--autoindent
--syntax perl
--smarthome
--smartbacks
--pound_comment
--single_quoted
-
 *.t
 -autoindent
 -syntax perl
@@ -226,7 +138,8 @@
 -pound_comment
 -single_quoted
 
- SQL file
+ SQL
+[sql]
 *.sql
 -autoindent
 -syntax sql
@@ -240,7 +153,8 @@
 -text_delimiters BEGIN|Begin|begin=END|End|end
 -cpara >#!;*/%
 
- AWK language file
+ AWK
+[awk]
 *.awk
 -autoindent
 -syntax awk
@@ -250,6 +164,7 @@
 -pound_comment
 
  YACC
+[yacc]
 *.y
 -autoindent
 -syntax c
@@ -263,20 +178,9 @@
 -text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
 -cpara >#!;*/%
 
- LEX
+ Lex
+[lex]
 *.l
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.lex
 -autoindent
 -syntax c
@@ -290,17 +194,9 @@
 -text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
 -cpara >#!;*/%
 
- ADA
+ Ada
+[ada]
 *.adb
--syntax ada
--autoindent
--istep 2
--smarthome
--smartbacks
--purify
--vhdl_comment
--text_delimiters declare|Declare|DECLARE|exception|Exception|EXCEPTION|if|If|IF|loop|Loop|LOOP|case|Case|CASE|package|Package|PACKAGE|procedure|Procedure|PROCEDURE|record|Record|RECORD|function|Function|FUNCTION=end|End|END
-
 *.ads
 -syntax ada
 -autoindent
@@ -312,146 +208,47 @@
 -text_delimiters declare|Declare|DECLARE|exception|Exception|EXCEPTION|if|If|IF|loop|Loop|LOOP|case|Case|CASE|package|Package|PACKAGE|procedure|Procedure|PROCEDURE|record|Record|RECORD|function|Function|FUNCTION=end|End|END
 
  COBOL
+[cobol]
 *.cbl
--syntax cobol
-
 *.cob
 -syntax cobol
 
  REXX
+[rexx]
 *.rex
--syntax rexx
--autoindent
-
 *.REX
--syntax rexx
--autoindent
-
 *
-+#!\+\[ 	]\+\[a-z/]/rxx\>
++#![ 	]*[^\n]*rexx[0-9.]*\>
 -syntax rexx
 -autoindent
 
- sed
+ SED script
+[sed]
 *.sed
 -syntax sed
 
  Postscript
+[postscript]
 *.ps
--syntax ps
-
 *.eps
 -syntax ps
 
- C language file
+ C language
+[c]
 *.c
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.cpp
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.cc
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.c++
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
  C language header file
 *.h
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.h.in
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.hpp
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.h++
--autoindent
--syntax c
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--c_comment
--cpp_comment
--text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
--cpara >#!;*/%
-
 *.hh
+*.mm
 -autoindent
 -syntax c
+-highlighter_context
 -smarthome
 -smartbacks
 -purify
@@ -461,19 +258,9 @@
 -text_delimiters #if|#ifdef|#ifndef=#elif=#else=#endif
 -cpara >#!;*/%
 
- Verilog file
+ Verilog
+[verilog]
 *.v
--autoindent
--syntax verilog
--istep 2
--smarthome
--smartbacks
--purify
--c_comment
--cpp_comment
--text_delimiters `ifdef|`ifndef=`else=`endif:begin=end:case|casex|casez=endcase:function=endfunction:module=endmodule:task=endtask:attribute=endattribute:primitive=endprimitive:table=endtable
--cpara >#!;*/%
-
  Verilog header file
 *.vh
 -autoindent
@@ -487,7 +274,8 @@
 -text_delimiters `ifdef|`ifndef=`else=`endif:begin=end:case|casex|casez=endcase:function=endfunction:module=endmodule:task=endtask:attribute=endattribute:primitive=endprimitive:table=endtable
 -cpara >#!;*/%
 
- VHDL file
+ VHDL
+[vhdl]
 *.vhd
 -autoindent
 -syntax vhdl
@@ -500,40 +288,46 @@
 -cpara >#!;*-/%
 
  XML
+[xml]
 *.xml
--autoindent
--syntax xml
-
 *.xsd
--autoindent
--syntax xml
-
 *
-+<\?xml
++<.xml
+*.jnlp
+ RESX/.NET resource files
+*.resx
+ Ant's build.xml
+*build.xml
 -autoindent
 -syntax xml
 
  Apple plists
+[plist]
 *.plist
 -autoindent
 -syntax xml
 
  HTML
+[html]
 *.htm
--wordwrap
--autoindent
--syntax html
-
 *.html
 -wordwrap
 -autoindent
+-smarthome
+-smartbacks
 -syntax html
 
  CSS
+[css]
 *.css
+-wordwrap
+-autoindent
+-smarthome
+-smartbacks
 -syntax css
 
- Java
+ JAVA
+[java]
 *.java
 -autoindent
 -syntax java
@@ -544,13 +338,11 @@
 -purify
 -cpara >#!;*/%
 
- JNLP
-*.jnlp
--autoindent
--syntax xml
-
  Javascript
+[javascript]
 *.js
+*
++#![ 	]*[^\n]*nodejs[0-9.]*\>
 -autoindent
 -syntax js
 -smarthome
@@ -561,6 +353,7 @@
 -cpara >#!;*/%
 
  JSON
+[json]
 *.json
 -autoindent
 -syntax json
@@ -568,6 +361,7 @@
 -smartbacks
 
  Typescript
+[typescript]
 *.ts
 -autoindent
 -syntax typescript
@@ -579,6 +373,7 @@
 -cpara >#!;*/%
 
  Hypertext preprocessor file
+[php]
 *.php
 -autoindent
 -syntax php
@@ -587,17 +382,9 @@
 -purify
 
  Python
+[python]
 *
-+#!\+\[ 	]\+\[a-z/]\+\[ 	]python\+\[0-9]\>
--autoindent
--syntax python
--highlighter_context
--smarthome
--smartbacks
--purify
--single_quoted
--pound_comment
-
++#![ 	]*[^\n]*python[0-9.]*\>
 *.py
 -autoindent
 -syntax python
@@ -608,98 +395,30 @@
 -single_quoted
 -pound_comment
 
- CSH
+ C-shell
+[csh]
 *
-+#!\+\[ 	]\+\[a-z/]/csh\>
--autoindent
--syntax csh
--pound_comment
-
++#![ 	]*[^\n 	]*/csh\>
++#![ 	]*[^\n 	]*/tcsh\>
 *.csh
--autoindent
--syntax csh
--pound_comment
-
 *.login
--autoindent
--syntax csh
--pound_comment
-
 *.logout
--autoindent
--syntax csh
--pound_comment
-
- TCSH
-*
-+#!\+\[ 	]\+\[a-z/]/tcsh\>
--autoindent
--syntax csh
--pound_comment
-
 *.tcsh
--autoindent
--syntax csh
--pound_comment
-
 *.tcshrc
 -autoindent
 -syntax csh
 -pound_comment
 
  Shell
+[sh]
 *
-+#!\+\[ 	]\+\[a-z/]/sh\>
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
++#![ 	]*[^\n 	]*/sh\>
++#![ 	]*[^\n 	]*/bash\>
 *.sh
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
 *profile
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
- BASH Shell
-*
-+#!\+\[ 	]\+\[a-z/]/bash\>
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
 *.bash
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
 *.bashrc
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
 *.bash_login
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
 *.bash_logout
 -autoindent
 -syntax sh
@@ -707,31 +426,19 @@
 -pound_comment
 -text_delimiters do=done:if=elif=else=fi:case=esac
 
- LISP
+ Lisp
+[lisp]
 *.lisp
--autoindent
--syntax lisp
--semi_comment
-
 *.lsp
--autoindent
--syntax lisp
--semi_comment
-
 *.el
 -autoindent
 -syntax lisp
 -semi_comment
 
- KSH
+ Korn shell
+[ksh]
 *
-+#!\+\[ 	]\+\[a-z/]/ksh\>
--autoindent
--syntax sh
--highlighter_context
--pound_comment
--text_delimiters do=done:if=elif=else=fi:case=esac
-
++#![ 	]*[^\n 	]*/ksh\>
 *.ksh
 -autoindent
 -syntax sh
@@ -739,41 +446,9 @@
 -pound_comment
 -text_delimiters do=done:if=elif=else=fi:case=esac
 
- Makefile
-*Makefile
--autoindent
--syntax conf
--pound_comment
-
-*makefile.in
--autoindent
--syntax conf
--pound_comment
-
-*Makefile.in
--autoindent
--syntax conf
--pound_comment
-
-*makefile
--autoindent
--syntax conf
--pound_comment
-
-*AKEFILE
--autoindent
--syntax conf
--pound_comment
-
- Pascal
+ PASCAL
+[pascal]
 *.p
--autoindent
--syntax pascal
--smarthome
--smartbacks
--purify
--text_delimiters begin|BEGIN|record|RECORD|case|CASE=end|END:repeat|REPEAT=until|UNTIL
-
 *.pas
 -autoindent
 -syntax pascal
@@ -782,24 +457,17 @@
 -purify
 -text_delimiters begin|BEGIN|record|RECORD|case|CASE=end|END:repeat|REPEAT=until|UNTIL
 
- Fortran
+ Fortral
+[fortran]
 *.f
--autoindent
--syntax fortran
-
 *.f90
--autoindent
--syntax fortran
-
 *.for
--autoindent
--syntax fortran
-
 *.FOR
 -autoindent
 -syntax fortran
 
  Cadence SKILL
+[skill]
 *.il
 -semi_comment
 -syntax skill
@@ -810,22 +478,22 @@
 -smarthome
 -indentfirst
 
- LUA
+ Lua
+[lua]
 *.lua
--autoindent
--syntax lua
-
 *
-+#!\+\[     ]\+\[a-z/ ]lua\>
++#![ 	]*[^\n]*lua[0-9.]*\>
 -autoindent
 -syntax lua
 
  TCL
+[tcl]
 *.tcl
 -autoindent
 -syntax tcl
 
  Go language
+[go]
 *.go
 -autoindent
 -syntax go
@@ -838,6 +506,7 @@
 -cpara >#!;*/%
 
  CSharp
+[c#]
 *.cs
 -autoindent
 -syntax csharp
@@ -847,107 +516,74 @@
 -cpara >#!;*/%
 -text_delimiters #region=#endregion:#if=#elif=#else=#endif
 
- RESX/.NET resource files
-*.resx
--autoindent
--syntax xml
-
  Joe Syntax File
+[jsf]
 *.jsf
--autoindent
--syntax jsf
--smarthome
-
 *.jsf.in
 -autoindent
 -syntax jsf
 -smarthome
 
- Autoconfig file
+ M4 / Autoconfig file
+[m4]
 *.ac
--autoindent
--syntax m4
-
- M4 file
 *.m4
 -autoindent
 -syntax m4
 
- Matlab file
+ Matlab file (clashes with objective-C)
+[matlab]
 *.m
 -wordwrap
 -syntax matlab
 
+ UNIX configuration file
+[conf]
  Automake file
 *.am
--autoindent
--syntax conf
-
- Mail file
-*tmp/mutt-*
--wordwrap
--syntax mail
-
  System RC file
 *rc
+ Makefile
+*Makefile
+*makefile.in
+*Makefile.in
+*makefile
+*AKEFILE
+-autoindent
 -syntax conf
+-pound_comment
 
  Windows batch files
+[bat]
 *.bat
--autoindent
--syntax batch
-
 *.cmd
 -autoindent
 -syntax batch
 
  JOERC file
+[joerc]
 *ftyperc
--syntax joerc
-
 *joerc
--syntax joerc
-
 *jmacsrc
--syntax joerc
-
 *jstarrc
--syntax joerc
-
 *rjoerc
--syntax joerc
-
 *jpicorc
--syntax joerc
-
 *joerc.in
--syntax joerc
-
 *jmacsrc.in
--syntax joerc
-
 *jstarrc.in
--syntax joerc
-
 *rjoerc.in
--syntax joerc
-
 *jpicorc.in
 -syntax joerc
 
  Markdown
+[markdown]
 *.md
 -syntax md
 -wordwrap
 
  YAML
+[yaml]
 *.yml
--autoindent
--smarthome
--smartbacks
--pound_comment
--syntax yaml
-
 *.yaml
 -autoindent
 -smarthome
@@ -956,19 +592,14 @@
 -syntax yaml
 
  Debian apt
+[debian]
 *apt/sources.list
--pound_comment
--syntax debian
-
 *sources.list.*
 -pound_comment
 -syntax debian
 
- Ant's build.xml
-*build.xml
--syntax ant
-
  Java's .properties
+[java_properties]
 *.properties
  this is part of the specification:
 -encoding iso-8859-1
@@ -976,40 +607,28 @@
 -syntax properties
 
  INI Files
+[ini]
 *.ini
--syntax ini
--pound_comment
--semi_comment
-
 *.inf
--syntax ini
--pound_comment
--semi_comment
-
 *hgrc
--pound_comment
--semi_comment
--syntax ini
-
 *.gitconfig
--pound_comment
--semi_comment
--syntax ini
-
 *.git/config
+-syntax ini
 -pound_comment
 -semi_comment
--syntax ini
 
  plain ERB
+[erb]
 *.erb
 -syntax erb
 
  ERB within HTML
+[erb_html]
 *.html.erb
 -syntax htmlerb
 
  Haml
+[haml]
 *.haml
 -syntax haml
 -istep 2
@@ -1019,69 +638,150 @@
 -smartbacks
 
  Erlang
+[erlang]
 *.erl
--syntax erlang
--autoindent
-
 *.eterm
--syntax erlang
--autoindent
-
 *.app.src
--syntax erlang
--autoindent
-
 *rebar.config
--syntax erlang
--autoindent
-
 *.hrl
--syntax erlang
--autoindent
-
 *.erlang
 -syntax erlang
 -autoindent
 
  Sieve (ManageSieve)
+[sieve]
 *.sieve
 -syntax sieve
 -autoindent
 
  Puppet
+[puppet]
 *.pp
 -syntax puppet
 -pound_comment
 -autoindent
 
  ip(6)tables
+[iptables]
 *
 +# Generated by iptables-save
--syntax iptables
--pound_comment
-
-*
 +# Generated by ip6tables-save
 -syntax iptables
 -pound_comment
 
  PowerShell
+[powershell]
 *.ps1
 -syntax powershell
 
  Git COMMIT_EDITMSG
+[git-commit]
 *COMMIT_EDITMSG
 -syntax git-commit
 
  Elixir
+[elixir]
 *.ex
+*.exs
 -autoindent
 -syntax elixir
 -pound_comment
 -text_delimiters do=end
 
-*.exs
+ R
+[r]
+*.r
 -autoindent
--syntax elixir
+-syntax r
 -pound_comment
--text_delimiters do=end
+-smarthome
+-smartbacks
+-purify
+-single_quoted
+
+ Groovy
+[groovy]
+*.gvy
+*.groovy
+*.gy
+*.gsh
+-autoindent
+-syntax groovy
+-c_comment
+-cpp_comment
+-smarthome
+-smartbacks
+-purify
+-single_quoted
+
+ Clojure
+[clojure]
+*.clj
+*.cljs
+*.cljc
+*.edn
+-autoindent
+-syntax clojure
+-semi_comment
+-smarthome
+-smartbacks
+-purify
+
+ Rust
+[rust]
+*.rs
+-autoindent
+-syntax rust
+-c_comment
+-cpp_comment
+-smarthome
+-smartbacks
+-purify
+-single_quoted
+
+ Coffeescript
+[coffee]
+*.coffee
+-autoindent
+-syntax coffee
+-pound_comment
+-smarthome
+-smartbacks
+-purify
+-single_quoted
+
+ Scala
+[scala]
+*.scala
+-autoindent
+-syntax scala
+-c_comment
+-cpp_comment
+-smarthome
+-smartbacks
+-purify
+-single_quoted
+
+ Swift
+[swift]
+*.swift
+-autoindent
+-syntax swift
+-c_comment
+-cpp_comment
+-smarthome
+-smartbacks
+-purify
+-single_quoted
+
+ D
+[d]
+*.d
+-autoindent
+-syntax d
+-c_comment
+-cpp_comment
+-smarthome
+-smartbacks
+-purify
+-single_quoted
diff --git a/config/obr/joe/jstarrc b/config/obr/joe/jstarrc
index 74912b5..c941e82 100644
--- a/config/obr/joe/jstarrc
+++ b/config/obr/joe/jstarrc
@@ -120,6 +120,8 @@
 
  -guess_utf8	Allow guess of UTF-8 file encoding in non-UTF-8 locale.
 
+-guess_utf16	Allow guess of UTF-16 encoding
+
 -guess_crlf     Automatically detect MS-DOS files and set -crlf appropriately
 
 -guess_indent	Guess indent character (tab or space).
@@ -149,6 +151,15 @@
  -joexterm	If you are using Joe's modified Xterm, which makes -mouse
 		mode work better (cut & paste work transparently).
 
+-brpaste	When JOE starts, send command to the terminal emulator that
+		enables "bracketed paste mode" (but only if the terminal
+		seems to have the ANSI command set).  In this mode, text
+		pasted into the window is bracketed with ESC [ 2 0 0 ~ and
+		ESC [ 2 0 1 ~.
+
+-pastehack	If keyboard input comes in as one block assume it's a mouse
+		paste and disable autoindent and wordwrap.
+
  -square	Rectangular block mode
 
  -text_color color
@@ -172,6 +183,9 @@
  -search_prompting
 		Search prompts with previous search request.
 
+ -regex		Search uses standard regular expression format (otherwise it uses
+		JOE format where all special characters have to be escaped).
+
  Status line definition strings.  -lmsg defines the left-justified string and
  -rmsg defines the right-justified string.  The first character of -rmsg is
  the background fill character.  The following escape sequences can be used
@@ -359,7 +373,9 @@
 
  SECOND and 1/2 SECTION: Option menu layout
 
-	:defmenu name	Defines a menu.
+	:defmenu name [macro]
+			Defines a menu.
+			The macro here is executed when the user hits backspace.
 
 	macro string comment
 			A menu entry.  Macro is any JOE macro- see "Macros:"
@@ -392,9 +408,10 @@ mode,"encoding",rtn	E Encoding
 mode,"asis",rtn	% % Meta chars as-is
 mode,"language",rtn	V Language
 mode,"picture",rtn	P picture %Zpicture%
+mode,"type",rtn		F File type [%Ztype%]
 menu,"more-options",rtn	  % % More options...
 
-:defmenu more-options
+:defmenu more-options menu,"root",rtn
 menu,"^G",rtn	% % ^G options
 menu,"search",rtn	% % search options
 menu,"paragraph",rtn	% % paragraph options
@@ -405,7 +422,7 @@ menu,"cursor",rtn	% % cursor options
 menu,"marking",rtn	% % marking options
 menu,"tab",rtn	% % tab/indent options
 
-:defmenu indent
+:defmenu indent menu,"root",rtn
 mode,"istep",rtn,"1",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 1, Indent character = 32",rtn	1 Space
 mode,"istep",rtn,"2",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 2, Indent character = 32",rtn	2 Spaces
 mode,"istep",rtn,"3",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 3, Indent character = 32",rtn	3 Spaces
@@ -415,13 +432,13 @@ mode,"istep",rtn,"8",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 8, Inden
 mode,"istep",rtn,"10",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 10, Indent character = 32",rtn	0 Ten
 mode,"istep",rtn,"1",rtn,mode,"indentc",rtn,"9",rtn,msg,"Indent step = 1, Indent character = 9",rtn	T Tab
 
-:defmenu menu
+:defmenu menu menu,"more-options",rtn
 mode,"menu_explorer",rtn	% % Menu explorer %Zmenu_explorer%
 mode,"menu_above",rtn	% % Menu position %Zmenu_above%
 mode,"menu_jump",rtn	% % Jump into menu %Zmenu_jump%
 mode,"transpose",rtn	% % Transpose menus %Ztranspose%
 
-:defmenu ^G
+:defmenu ^G menu,"more-options",rtn
 mode,"highlighter_context",rtn	% % ^G uses highlighter context %Zhighlighter_context%
 mode,"single_quoted",rtn	% % ^G ignores '...' %Zsingle_quoted%
 mode,"no_double_quoted",rtn	% % ^G no ignore "..." %Zno_double_quoted%
@@ -433,28 +450,29 @@ mode,"semi_comment",rtn	% % ^G ignores ;... %Zsemi_comment%
 mode,"tex_comment",rtn % % ^G ignores %%... %Ztex_comment%
 mode,"text_delimiters",rtn % % Text delimiters %Ztext_delimiters%
 
-:defmenu search
+:defmenu search menu,"more-options",rtn
 mode,"icase",rtn	% % Case insensitivity %Zicase%
 mode,"wrap",rtn	% % Search wraps %Zwrap%
 mode,"search_prompting",rtn	% % Search prompting %Zsearch_prompting%
 mode,"csmode",rtn	% % Continued search %Zcsmode%
 
-:defmenu paragraph
+:defmenu paragraph menu,"more-options",rtn
 mode,"french",rtn	% % French spacing %Zfrench%
 mode,"flowed",rtn	% % Flowed text %Zflowed%
 mode,"cpara",rtn	% % Paragraph indent chars %Zcpara%
 mode,"cnotpara",rtn	% % Not-paragraph chars %Zcnotpara%
 
-:defmenu file
+:defmenu file menu,"more-options",rtn
 mode,"restore",rtn	% % Restore cursor %Zrestore%
 mode,"guess_crlf",rtn	% % Auto detect CR-LF %Zguess_crlf%
 mode,"guess_indent",rtn	% % Guess indent %Zguess_indent%
 mode,"guess_non_utf8",rtn	% % Guess non-UTF-8 %Zguess_non_utf8%
 mode,"guess_utf8",rtn	% % Guess UTF-8 %Zguess_utf8%
+mode,"guess_utf16",rtn	% % Guess UTF-16 %Zguess_utf16%
 mode,"force",rtn	% % Force last NL %Zforce%
 mode,"nobackup",rtn	% % No backup %Znobackup%
 
-:defmenu global
+:defmenu global menu,"more-options",rtn
 mode,"nolocks",rtn	% % Disable locks %Znolocks%
 mode,"nobackups",rtn	% % Disable backups %Znobackups%
 mode,"nodeadjoe",rtn	% % Disable DEADJOE %Znodeadjoe%
@@ -469,18 +487,18 @@ mode,"joe_state",rtn	% % Joe_state file %Zjoe_state%
 mode,"undo_keep",rtn	% % No. undo records %Zundo_keep%
 mode,"backpath",rtn	% % Path to backup files %Zbackpath%
 
-:defmenu cursor
+:defmenu cursor menu,"more-options",rtn
 mode,"pg",rtn	% % No. PgUp/PgDn lines %Zpg%
 mode,"mid",rtn	C Center on scroll %Zmid%
 mode,"floatmouse",rtn	% % Click past end %Zfloatmouse%
 mode,"rtbutton",rtn	% % Right button %Zrtbutton%
 
-:defmenu marking
+:defmenu marking menu,"more-options",rtn
 mode,"autoswap",rtn	% % Autoswap mode %Zautoswap%
 mode,"marking",rtn	% % Marking %Zmarking%
 mode,"lightoff",rtn	% % Auto unmask %Zlightoff%
 
-:defmenu tab
+:defmenu tab menu,"more-options",rtn
 mode,"smarthome",rtn	% % Smart home key %Zsmarthome%
 mode,"smartbacks",rtn	% % Smart backspace %Zsmartbacks%
 mode,"indentfirst",rtn	% % To indent first %Zindentfirst%
@@ -536,31 +554,39 @@ mode,"spaces",rtn	% % No tabs %Zspaces%
 }
 
 {Search
-\i   Help Screen    \|turn off with ^J     prev. screen ^[,    next screen ^[.     \i
-\i \iSpecial search sequences:                                                    \|\i \i
-\i \i    \\^  \\$  matches beg./end of line      \\?     match any single char       \|\i \i
-\i \i    \\<  \\>  matches beg./end of word      \\*     match 0 or more chars       \|\i \i
-\i \i    \\c      matches balanced C expression \\\\     matches a \\                 \|\i \i
-\i \i    \\[..]   matches one of a set          \\n     matches a newline           \|\i \i
-\i \i    \\+      matches 0 or more of the character which follows the \\+          \|\i \i
-\i \iSpecial replace sequences:                                                   \|\i \i
-\i \i    \\&      replaced with text which matched search string                   \|\i \i
-\i \i    \\0 - 9  replaced with text which matched Nth \\*, \\?, \\c, \\+, or \\[..]    \|\i \i
-\i \i    \\\\      replaced with \\               \\n     replaced with newline       \|\i \i
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \iSearch sequences:                                                            \|\i \i
+\i \i    \\^  \\$  matches beg./end of line       \\.     match any single char      \|\i \i
+\i \i    \\<  \\>  matches beg./end of word       \\!     match char or expression   \|\i \i
+\i \i    \\(  \\)  grouping                       \\|     match left or right         \|\i \i
+\i \i    \\[a-z]  matches one of a set                                             \|\i \i
+\i \i    \\{1,3}  match 1 - 3 occurrences        \\?     match 0 or 1 occurrence     \|\i \i
+\i \i    \\+      match 1 or more occurrences    \\*     match 0 or more occurrences \|\i \i
+\i \iReplace sequences:                                                           \|\i \i
+\i \i    \\&      replaced with entire match     \\1 - 9 replaced with Nth group   \|\i \i
+\i \i    \\u \\l   convert next to upper/lower    \\U \\L  case convert until \\E     \|\i \i
+}
+
+{Escape sequences
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \iEscape sequences: \\x{10fff}  Unicode code point   \\p{Ll}  Unicode category \|\i \i
+\i \i    \\i / \\I  Identifier start      \\t  tab          \\e  escape               \|\i \i
+\i \i    \\c / \\C  Identifier continue   \\n  newline      \\r  carriage return      \|\i \i
+\i \i    \\d / \\D  Digit / Not a digit   \\b  backspace  \\xFF  hex character        \|\i \i
+\i \i    \\w / \\W  Word / Not a word     \\a  alert      \\377  octal character      \|\i \i
+\i \i    \\s / \\S  Space / Not a space   \\f  formfeed     \\\\  backslash            \|\i \i
 }
 
 {SearchOptions
 \i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
 \i \iSearch options:                                                              \|\i \i
-\i \i   r Replace                                                                 \|\i \i
-\i \i   k Restrict search to highlighted block, which can be rectangular          \|\i \i
-\i \i   b Search backward instead of forward                                      \|\i \i
-\i \i   i Ignore case                                                             \|\i \i
-\i \i   a Search across all loaded files                                          \|\i \i
-\i \i   e Search across all files in Grep or Compile error list                   \|\i \i
-\i \i   w Wrap to beginning of file for this search                               \|\i \i
-\i \i   n Do not wrap to beginning of file for this search                        \|\i \i
-\i \i   nnn Perform exaclty nnn replacements                                      \|\i \i
+\i \i     r Replace      k Restrict search to highlighted block                   \|\i \i
+\i \i     i Ignore case  b Search backwards instead of forwards                   \|\i \i
+\i \i                    a Search across all loaded files                         \|\i \i
+\i \i                    e Search across all files in Grep or Compile error list  \|\i \i
+\i \i w / n  Allow / prevent wrap to start of file                                \|\i \i
+\i \i x / y  Search text is standard format / JOE format regular expression       \|\i \i
+\i \i   nnn  Perform exactly nnn replacements                                     \|\i \i
 }
 
 {Math
@@ -670,7 +696,7 @@ mode,"spaces",rtn	% % No tabs %Zspaces%
  Macros may cross lines if they end with ,
 
 :windows		Bindings common to all windows
-type		^@ TO ÿ
+type		U+0 TO U+10FFFF
 abort		^K Q
 abort		^K ^Q
 abort		^K q
@@ -740,16 +766,16 @@ extmouse	^[ [ <		Introduces an extended xterm mouse event
 :def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword
 
 
-ispellfile	^Q l
-ispellfile	^Q L
-ispellfile	^Q ^L
-ispellword	^Q n
-ispellword	^Q N
-ispellword	^Q ^N
+aspellfile	^Q l
+aspellfile	^Q L
+aspellfile	^Q ^L
+aspellword	^Q n
+aspellword	^Q N
+aspellword	^Q ^N
 
  Compile macro
 
-:def compile querysave,query,scratch,"* Build Log *",rtn,markb,eof," ",markk,blkdel,build
+:def compile mwind!,mfit!,querysave,query,scratch,"* Build Log *",rtn,markb,eof," ",markk,blkdel,build
 
  Grep
 
@@ -760,11 +786,12 @@ ispellword	^Q ^N
 :def man scratch,"* Man Page *",rtn,bof,markb,eof," ",markk,blkdel," ",ltarw,run,"man -P cat -S 2:3 "
 
  Shell windows
+ We load the already existing Startup Log first so that Shell does not inherit the current directory.
 
-:def shell1 scratch,"* Shell 1 *",rtn,vtbknd!,eof
-:def shell2 scratch,"* Shell 2 *",rtn,vtbknd!,eof
-:def shell3 scratch,"* Shell 3 *",rtn,vtbknd!,eof
-:def shell4 scratch,"* Shell 4 *",rtn,vtbknd!,eof
+:def shell1 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 1 *",rtn,vtbknd!,eof
+:def shell2 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 2 *",rtn,vtbknd!,eof
+:def shell3 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 3 *",rtn,vtbknd!,eof
+:def shell4 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 4 *",rtn,vtbknd!,eof
 
  Macros allowed in shell window commands
 :def shell_clear psh,bof,markb,eof,markk,blkdel
@@ -789,6 +816,7 @@ ispellword	^Q ^N
 
 paste			^[ ] 5 2 ;		Base64 paste (obsolete)
 brpaste			^[ [ 2 0 0 ~		Bracketed paste
+brpaste_done		^[ [ 2 0 1 ~		Bracketed paste done
 
 insc			^[ [ 2 ~
 insc			^[ [ L			SCO
@@ -853,9 +881,9 @@ quote		^P		Quote Ctrl chars
 backs		^?		Backspace
 backs		^H
 bknd		^K '		Shell window
-bkwdc		^Q H ^@ TO ÿ
-bkwdc		^Q ^H ^@ TO ÿ
-bkwdc		^Q h ^@ TO ÿ
+bkwdc		^Q H U+0 TO U+10FFFF
+bkwdc		^Q ^H U+0 TO U+10FFFF
+bkwdc		^Q h U+0 TO U+10FFFF
 blkcpy		^K C		Copy marked block
 blkcpy		^K ^C
 blkcpy		^K c
@@ -936,9 +964,9 @@ qrepl		^Q a
 filt		^K /		Filter block
 fnext		^L		Find next
 format		^B		Format paragraph
-fwrdc		^Q G ^@ TO ÿ
-fwrdc		^Q ^G ^@ TO ÿ
-fwrdc		^Q g ^@ TO ÿ
+fwrdc		^Q G U+0 TO U+10FFFF
+fwrdc		^Q ^G U+0 TO U+10FFFF
+fwrdc		^Q g U+0 TO U+10FFFF
 gomark		^Q 0 TO 9
 groww		^K G		Grow window
 groww		^K ^G
@@ -1127,10 +1155,10 @@ defm2down	M2DOWN		Hits return key
 :inherit windows
 
 :querya			Single-key query window for quoting
-type		^@ TO ÿ
+type		U+0 TO U+10FFFF
 
 :querysr		Search & replace query window
-type		^@ TO ÿ
+type		U+0 TO U+10FFFF
 
 :shell			Input to shell windows
 :inherit main
diff --git a/config/obr/unbound/etc/root.hints b/config/obr/unbound/etc/root.hints
index 71713d8..3c82146 100644
--- a/config/obr/unbound/etc/root.hints
+++ b/config/obr/unbound/etc/root.hints
@@ -9,8 +9,8 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    December 01, 2015
-;       related version of root zone:   2015120100
+;       last update:    March 23, 2016
+;       related version of root zone:   2016032301
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -80,7 +80,7 @@ K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
 ;
 .                        3600000      NS    L.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:9f::42
 ;
 ; OPERATED BY WIDE
 ;