Release

005-revert-to-joe-3.7-due-to-problems-with-serial-consol.patch

@@ -0,0 +1,46 @@
+From f6cc3414940e328e0af40cad3905852c44580dbd Mon Sep 17 00:00:00 2001
+From: Reinhard Russinger <reinhard.russinger@psgmail.de>
+Date: Wed, 6 Mar 2019 12:27:12 +0100
+Subject: [PATCH] revert to joe 3.7 due to problems with serial console
+
+---
+ package/joe/joe.hash | 5 +----
+ package/joe/joe.mk   | 4 ++--
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/package/joe/joe.hash b/package/joe/joe.hash
+index 0a9c1fb..664410d 100644
+--- a/package/joe/joe.hash
++++ b/package/joe/joe.hash
+@@ -1,5 +1,2 @@
+-# From https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-4.4/
+-sha1 aedf1ac9e6b91053aa26c70e7bba5bbd8136f033  joe-4.4.tar.gz
+-md5 59e63debe60b456a6ee5c0c27a756a47  joe-4.4.tar.gz
+ # Locally computed:
+-sha256 a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979  joe-4.4.tar.gz
++sha256  cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f  joe-3.7.tar.gz
+diff --git a/package/joe/joe.mk b/package/joe/joe.mk
+index 3d0e9f7..e19cae1 100644
+--- a/package/joe/joe.mk
++++ b/package/joe/joe.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-JOE_VERSION = 4.4
++JOE_VERSION = 3.7
+ JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION)
+ JOE_LICENSE = GPL-1.0+
+ JOE_LICENSE_FILES = COPYING
+@@ -18,7 +18,7 @@ endif
+ 
+ ifneq ($(BR2_PACKAGE_JOE_FULL),y)
+ define JOE_INSTALL_TARGET_CMDS
+-	$(INSTALL) -m 0755 -D $(@D)/joe/joe $(TARGET_DIR)/usr/bin/joe
++	$(INSTALL) -m 0755 -D $(@D)/joe $(TARGET_DIR)/usr/bin/joe
+ endef
+ endif
+ 
+-- 
+2.7.4
+

006-fix-some-issues-in-copy-to-mmc.patch

@@ -0,0 +1,24 @@
+From 3fb73635f710cda15a408e3b064ee3a1759fe1a0 Mon Sep 17 00:00:00 2001
+From: Reinhard Russinger <reinhard.russinger@psgmail.de>
+Date: Wed, 6 Mar 2019 12:31:46 +0100
+Subject: [PATCH] fix some issues in copy to mmc
+
+---
+ CopyToMMC0.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CopyToMMC0.sh b/CopyToMMC0.sh
+index 18c8af5..ac81004 100755
+--- a/CopyToMMC0.sh
++++ b/CopyToMMC0.sh
+@@ -5,6 +5,6 @@ TODEV=/dev/sdb
+ 
+ echo $FSIZE
+ 
+-sudo umount ${TODEV}p1 ${TODEV}p2
++sudo umount ${TODEV}1 ${TODEV}2
+ sudo dd if=$FNAME | pv -s $FSIZE | sudo dd of=$TODEV bs=16M
+ sync
+-- 
+2.7.4
+

MakeBuildrootEnv.sh

@@ -11,6 +11,8 @@ patch -p1 < ../PSG/001-PSG_add_CrossCompile_sh.patch
 patch -p1 < ../PSG/002-PSG-addCopyToMMCScript.patch
 patch -p1 < ../PSG/003-PSG-modify-CrossCompile-script.patch
 patch -p1 < ../PSG/004_PSG-modify_CopyTommc.patch
+patch -p1 < ../PSG/005-revert-to-joe-3.7-due-to-problems-with-serial-consol.patch
+patch -p1 < ../PSG/006-fix-some-issues-in-copy-to-mmc.patch
 #
 chmod a+x *.sh
 cp ../PSG/configs/* ./configs

board/PSG/iot2000/rootfs_overlay/etc/joe/joerc

@@ -18,7 +18,7 @@
  Put each color override you want in the first column.
 
  Valid colors:
-   bold inverse blink dim underline italic
+   bold inverse blink dim underline
    white cyan magenta blue yellow green red black
    bg_white bg_cyan bg_magenta bg_blue bg_yellow bg_green bg_red bg_black
 
@@ -54,8 +54,6 @@
  -help_is_utf8	Set if help text is in UTF-8 format.  Leave clear if it's a raw 8-bit format.
 
  -mid		Cursor is recentered when scrolling is necessary
- -left nn	Amount to jump left when scrolling is necessary (-1 for 1/4 width)
- -right nn	Amount to jump right when scrolling is necessary (-1 for 1/4 width)
 
  -marking	Text between ^KB and cursor is highlighted (use with -lightoff)
 
@@ -72,8 +70,6 @@
 
 -nobackups	If you don't want backup files to be created
 
- -nodeadjoe	If you don't want DEADJOE files to be created
-
  -break_hardlinks
 		Delete file before writing, to break hard links
 		(but don't break symbolic links).
@@ -91,7 +87,7 @@
 
  -nosta		Disable top-most status line
 
--keepup	%k and %c status line escape sequences updated frequently
+ -keepup	%k and %c status line escape sequences updated frequently
 
  -pg nnn	No. lines to keep for PgUp/PgDn
 
@@ -110,9 +106,7 @@
 
  -nonotice	Disable copyright notice
 
- -noexmsg	Disable exiting message ("File not changed so no update needed")
-
--noxon		Attempt to turn off ^S/^Q processing
+ -noxon		Attempt to turn off ^S/^Q processing
 
  -orphan	Put extra files given on command line in orphaned buffers
 		instead of in windows
@@ -125,16 +119,13 @@
 
  -columns nnn	Set no. screen columns
 
- -helpon	Start with help on
+ -help		Start with help on
 
  -skiptop nnn	Don't use top nnn lines of the screen
 
 -notite         Don't send terminal initialization and termination strings:
                 prevents restoration of screen on exit.
 
- -nolinefeeds	Prevent sending linefeeds to preserve screen history in terminal
-                emulator's scroll-back buffer.
-
  -usetabs       Use tabs to help optimize screen update.
 
 -assume_color	Assume terminal has ANSI color support even if termcap/terminfo entry
@@ -150,8 +141,6 @@
 
  -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).
@@ -167,8 +156,6 @@
  -menu_jump	Jump into file selection menu when tab is hit (otherwise, menu
 		comes up, but cursor stays in file name prompt).
 
- -notagsmenu	Disable tags file search menu
-
  -icase         Search is case insensitive by default.
 
  -wrap          Search wraps
@@ -187,15 +174,6 @@
 		mouse can be pasted into other application, and middle
 		button clicks paste into JOE).
 
--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
@@ -219,9 +197,6 @@
 -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
@@ -243,22 +218,18 @@
   %O  Byte offset into file in hex
   %a  Ascii value of character under cursor
   %A  Ascii value of character under cursor in hex
-  %w  Width of character under cursor
   %p  Percent of file cursor is at
   %l  No. lines in file
   %k  Entered prefix keys
   %S  '*SHELL*' if there is a shell running in window
   %M  Macro recording message
   %y  Syntax
-  %e  Encoding of file
-  %b  Encoding of terminal
   %x  Context (first non-indented line going backwards)
   %dd day
   %dm month
   %dY year
   %Ename%  value of environment variable
-  %Zname%  value of option (ON or OFF for boolean options)
-           (hit TAB at mode command prompt for full list)
+  %Tname%  value of option (ON or OFF for boolean options)
 
  These formatting escape sequences may also be given:
  
@@ -267,27 +238,16 @@
   \b  Bold
   \d  Dim
   \f  Blink
-  \l  Italic
 
 -lmsg \i%k%T%W%I%X %n %m%y%R %M %x
--rmsg  %S Row %4r Col %3c 
--smsg ** Line %r Col %c Offset %o(0x%O) %e %a(0x%A) Width %w ** 
--zmsg ** Line %r Col %c Offset %o(0x%O) ** 
--xmsg \i Joe's Own Editor %v (%b) ** Type \bCtrl-K Q\b to exit or \bCtrl-K H\b for help **\i
-
- Key sequence hints which are displayed in various prompts.
--aborthint ^C
--helphint ^K H
+-rmsg  %S Row %r Col %c %t  Ctrl-K H for help
 
  SECOND SECTION: File name dependant local option settings:
 
- Name a file type definition section with:
-
-   [python]  (but put opening bracket in first column)
-
- Each line with '*' in the first column provides a file name matching
- regular expression (in shell glob format).  If more than one regular
- expression matches the file name, then the last matching one is chosen.
+ Each line with '*' in the first column indicates the modes which should be
+ set for files whose name matches the regular expression.  If more than one
+ regular expression matches the file name, then the last matching one is
+ chosen.
 
  A file contents regular expression may also be specified on a separate line
  with '+regex'.  If this regular expresssion is given, then both the file name
@@ -298,9 +258,6 @@
 	-cpara >#!;*/%
 				Characters which can indent paragraphs.
 
-	-cnotpara .
-				Characters which begin non-paragraph lines.
-
 	-encoding name
 				Set file coding (for example: utf-8, iso-8859-15)
 
@@ -387,8 +344,6 @@
 
 	These define the language syntax for ^G (goto matching delimiter):
 
-	-highlighter_context	Use the highlighter context for ^G
-
 	-single_quoted		Text between '  ' should be ignored (this is
 				not good for regular text since ' is
 				normally used alone as an apostrophe)
@@ -412,7 +367,7 @@
 
  Default local options
 -highlight
--istep 4
+-istep 2
 
  Perforce macro: use this macro (put in first column) to have joe "p4 edit"
  a file you're about to change.
@@ -427,9 +382,7 @@
 
  SECOND and 1/2 SECTION: Option menu layout
 
-	:defmenu name [macro]
-			Defines a menu.
-			The macro here is executed when the user hits backspace.
+	:defmenu name	Defines a menu.
 
 	macro string comment
 			A menu entry.  Macro is any JOE macro- see "Macros:"
@@ -442,18 +395,17 @@
 
 :defmenu root
 mode,"overwrite",rtn	T Overtype %Zoverwrite%
-mode,"hex",rtn	' Hex edit mode
+mode,"hex",rtn	% % Hex edit mode
 mode,"autoindent",rtn	I Autoindent %Zautoindent%
 mode,"wordwrap",rtn	W Word wrap %Zwordwrap%
 mode,"tab",rtn	D Tab width %Ztab%
 mode,"lmargin",rtn	L Left margin %Zlmargin%
 mode,"rmargin",rtn	R Right margin %Zrmargin%
-mode,"square",rtn	X Column mode %Zsquare%
+mode,"square",rtn	X Rectangle mode %Zsquare%
 mode,"indentc",rtn	% % Indent char %Zindentc%
 mode,"istep",rtn	% % Indent step %Zistep%
-menu,"indent",rtn	= Indent select
 mode,"highlight",rtn	H Highlighting %Zhighlight%
-mode,"crlf",rtn	Z CR-LF/MS-DOS %Zcrlf%
+mode,"crlf",rtn	Z CR-LF (MS-DOS) %Zcrlf%
 mode,"linums",rtn	N Line numbers %Zlinums%
 mode,"beep",rtn	B Beep %Zbeep%
 mode,"rdonly",rtn	O Read only %Zrdonly%
@@ -462,11 +414,9 @@ 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%]
-mode,"title",rtn	C Context %Ztitle%
 menu,"more-options",rtn	  % % More options...
 
-:defmenu more-options menu,"root",rtn
+:defmenu more-options
 menu,"^G",rtn	% % ^G options
 menu,"search",rtn	% % search options
 menu,"paragraph",rtn	% % paragraph options
@@ -477,24 +427,13 @@ menu,"cursor",rtn	% % cursor options
 menu,"marking",rtn	% % marking options
 menu,"tab",rtn	% % tab/indent options
 
-: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
-mode,"istep",rtn,"4",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 4, Indent character = 32",rtn	4 Spaces
-mode,"istep",rtn,"5",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 5, Indent character = 32",rtn	5 Spaces
-mode,"istep",rtn,"8",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 8, Indent character = 32",rtn	8 Spaces
-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 menu,"more-options",rtn
+:defmenu menu
 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 menu,"more-options",rtn
-mode,"highlighter_context",rtn	% % ^G uses highlighter context %Zhighlighter_context%
+:defmenu ^G
 mode,"single_quoted",rtn	% % ^G ignores '...' %Zsingle_quoted%
 mode,"no_double_quoted",rtn	% % ^G no ignore "..." %Zno_double_quoted%
 mode,"c_comment",rtn	% % ^G ignores /*...*/ %Zc_comment%
@@ -502,35 +441,32 @@ mode,"cpp_comment",rtn	% % ^G ignores //... %Zcpp_comment%
 mode,"pound_comment",rtn	% % ^G ignores #... %Zpound_comment%
 mode,"vhdl_comment",rtn	% % ^G ignores --... %Zvhdl_comment%
 mode,"semi_comment",rtn	% % ^G ignores ;... %Zsemi_comment%
-mode,"tex_comment",rtn % % ^G ignores %%... %Ztex_comment%
+mode,"tex_comment",rtn % % ^G ignores %... %Ztex_comment%
 mode,"text_delimiters",rtn % % Text delimiters %Ztext_delimiters%
 
-:defmenu search menu,"more-options",rtn
+:defmenu search
 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 menu,"more-options",rtn
+:defmenu paragraph
 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 menu,"more-options",rtn
+:defmenu file
 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 menu,"more-options",rtn
+:defmenu global
 mode,"nolocks",rtn	% % Disable locks %Znolocks%
 mode,"nobackups",rtn	% % Disable backups %Znobackups%
-mode,"nodeadjoe",rtn	% % Disable DEADJOE %Znodeadjoe%
 mode,"nomodcheck",rtn	% % Disable mtime check %Znomodcheck%
 mode,"nocurdir",rtn	% % Disable current dir %Znocurdir%
 mode,"exask",rtn	% % Exit ask %Zexask%
@@ -542,20 +478,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 menu,"more-options",rtn
+:defmenu cursor
 mode,"pg",rtn	% % No. PgUp/PgDn lines %Zpg%
 mode,"mid",rtn	C Center on scroll %Zmid%
-mode,"left",rtn	L Columns to scroll left %Zleft%
-mode,"right",rtn R Columns to scroll right %Zright%
 mode,"floatmouse",rtn	% % Click past end %Zfloatmouse%
 mode,"rtbutton",rtn	% % Right button %Zrtbutton%
 
-:defmenu marking menu,"more-options",rtn
+:defmenu marking
 mode,"autoswap",rtn	% % Autoswap mode %Zautoswap%
 mode,"marking",rtn	% % Marking %Zmarking%
 mode,"lightoff",rtn	% % Auto unmask %Zlightoff%
 
-:defmenu tab menu,"more-options",rtn
+:defmenu tab
 mode,"smarthome",rtn	% % Smart home key %Zsmarthome%
 mode,"smartbacks",rtn	% % Smart backspace %Zsmartbacks%
 mode,"indentfirst",rtn	% % To indent first %Zindentfirst%
@@ -569,7 +503,6 @@ mode,"spaces",rtn	% % No tabs %Zspaces%
  Use \b to turn on/off bold
  Use \d to turn on/off dim
  Use \f to turn on/off flash
- Use \l to turn on/off italic
 
  Use \| to insert a spring: all springs in a given line are set to the same
  width such that the entire line exactly fits in the width of the screen (if
@@ -581,163 +514,122 @@ mode,"spaces",rtn	% % No tabs %Zspaces%
  text.  Otherwise, the locale 8-bit character set is assumed.
 
 {Basic
- \|\uREGION\u        \|\uGO TO\u           \|\uGO TO\u           \|\uDELETE\u    \|\uEXIT\u       \|\uSEARCH\u    \| 
- \|\b^Arrow\b Select \|\b^Z\b Prev. word   \|\b^U/^V\b PgUp/PgDn \|\b^D\b Char.  \|\b^KX\b Save   \|\b^KF\b Find  \| 
- \|\b^KB\b Begin     \|\b^X\b Next word    \|\uMISC\u            \|\b^Y\b Line   \|\b^C\b  Abort  \|\b^L\b  Next  \| 
- \|\b^KK\b End       \|\b^KU\b Top of file \|\b^KJ\b Paragraph   \|\b^W\b >Word  \|\b^KQ\b All    \|\uHELP\u      \| 
- \|\b^KC\b Copy      \|\b^KV\b End of file \|\b^KA\b Center line \|\b^O\b Word<  \|\uFILE\u       \|\bEsc .\b Next\| 
- \|\b^KM\b Move      \|\b^A\b Beg. of line \|\b^K Space\b Status \|\b^J\b >Line  \|\b^KE\b Edit   \|\bEsc ,\b Prev\| 
- \|\b^KW\b File      \|\b^E\b End of line  \|\uSPELL\u           \|\b^[O\b Line< \|\b^KR\b Insert \|\b^KH\b Off   \| 
- \|\b^KY\b Delete    \|\b^KL\b To line no. \|\bEsc N\b Word      \|\b^_\b Undo   \|\b^KD\b Save   \|\b^T\b  Menu  \| 
- \|\b^K/\b Filter    \|\b^G\b  Matching (  \|\bEsc L\b File      \|\b^^\b Redo   \|\b^K`\b Revert \|\b\b          \| 
+\i   Help Screen    \|turn off with ^KH    more help with ESC . (^[.)              \i
+\i \i\|\uCURSOR\u           \|\uGO TO\u            \|\uBLOCK\u      \|\uDELETE\u   \|\uMISC\u         \|\uEXIT\u      \|\i \i
+\i \i\|^B left ^F right \|^U  prev. screen \|^KB begin  \|^D char. \|^KJ reformat \|^KX save  \|\i \i
+\i \i\|^P up   ^N down  \|^V  next screen  \|^KK end    \|^Y line  \|^KA center   \|^C  abort \|\i \i
+\i \i\|^Z previous word \|^A  beg. of line \|^KM move   \|^W >word \|^T  options  \|^KZ shell \|\i \i
+\i \i\|^X next word     \|^E  end of line  \|^KC copy   \|^O word< \|^R  refresh  \|\uFILE\u      \|\i \i
+\i \i\|\uSEARCH\u           \|^KU top of file  \|^KW file   \|^J >line \|\uSPELL\u        \|^KE edit  \|\i \i
+\i \i\|^KF find text    \|^KV end of file  \|^KY delete \|^_ undo  \|^[N word     \|^KR insert\|\i \i
+\i \i\|^L  find next    \|^KL to line No.  \|^K/ filter \|^^ redo  \|^[L file     \|^KD save  \|\i \i
+}
+
+{Windows
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \i\|^KO Split the window in half           \|^KE Load file into window             \|\i \i
+\i \i\|^KG Make current window bigger         \|^KT Make current window smaller       \|\i \i
+\i \i\|^KN Go to the window below             \|^KP Go to the window above            \|\i \i
+\i \i\|^[V Switch to next buffer              \|^[U Switch to previous buffer         \|\i \i
+\i \i\|^C  Eliminate the current window       \|^KI Show all windows / Show one window\|\i \i
 }
 
 {Advanced
- \|\uMACROS\u         \|\uSCROLL\u           \|\uWINDOW\u               \|\uGO TO\u      \|\uI-SEARCH\u     \| 
- \|\b^K[ 0-9\b Record \|\bEsc W\b Up         \|\b^KO\b Open  \b^C\b  Close  \|\bEsc B\b / \bK\b  \|\b^R\b Backwards \| 
- \|\b^K]\b     Stop   \|\bEsc Z\b Down       \|\b^KG\b Grow  \b^KT\b Shrink \|to \b^KB\b/\b^KK \b\|\b^S\b Forwards  \| 
- \|\bEsc I\b   Text   \|\bEsc <\b Left       \|\b^KN\b Next  \b^KP\b Prev.  \|\b^P\b  Up     \|\uBOOKMARKS\u    \| 
- \|\b^K?\b     Pause  \|\bEsc >\b Right      \|\b^KI\b Show one / All   \|\b^N\b  Down   \|\bEsc 0-9\b Goto \| 
- \|   for prompt  \|\uINSERT\u           \|\uSHELL\u                \|\b^B\b  Left   \|\bEsc Esc\b Set  \| 
- \|\b^K 0-9\b  Play   \|\b^]\b Line  \b^Q\b Ctrl \|\bF1-F4\b Term emulator  \|\b^F\b  Right  \|\b^K-\b Auto prev\| 
- \|\b^K\\\b     Repeat \|\b^@\b Space \b^\\\b Meta \|\b^K'\b In buffer        \|           \|\b^K=\b Auto next\| 
- \|\bEsc D\b   Dump   \|\bEsc Y\b Paste      \|\b^KZ\b Suspend  \bEsc !\b Append \|      \|             \| 
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \i\|\uMACROS\u         \|\uMISC\u            \|\uSCROLL\u    \|\uSHELL\u       \|\uGOTO\u       \|\uI-SEARCH\u     \|\i \i
+\i \i\|^K[ 0-9 Record \|^K SPACE status \|^[W Up    \|^K' Window  \|^[B To ^KB \|^[R Backwards\|\i \i
+\i \i\|^K]     Stop   \|^K\\ Repeat      \|^[Z Down  \|^[! Command \|^[K To ^KK \|^[S Forwards \|\i \i
+\i \i\|^K 0-9  Play   \|\uINSERT\u          \|^K< Left  \|\uQUOTE\u       \|\uDELETE\u     \|\uBOOKMARKS\u    \|\i \i
+\i \i\|^K?     Query  \|^] split line   \|^K> Right \|^[' Ctrl-   \|^[Y yank   \|^[ 0-9 Goto  \|\i \i
+\i \i\|^[D     Dump   \|^SPACE ins space\|          \|^\\ Meta-    \|^[O line<  \|^[^[   Set   \|\i \i
 }
 
 {Programs
- \|\uCOMMANDS\u            \|\uCOMPILING\u                  \|\uQUICK\u                       \| 
- \|\bEsc X\b Command prompt\|\bEsc C\b Save modified compile\|\b^G\b  Find word under cursor  \| 
- \|\bEsc M\b Calculator    \|\bEsc G\b Grep                 \|\b^K;\b Tags file search        \| 
- \|\bshowlog\b Startup log \|\bEsc =\b To next error        \|\bEsc Enter\b Complete word     \| 
- \|\bupper\b   Change case \|\bEsc -\b To prev. error       \|\uBUFFER\u                      \| 
- \|\blower\b   Change case \|\bEsc Space\b Jump to error    \|\bEsc U\b Next                  \| 
- \|\bcd\b      Change dir  \|\uINDENT\u                     \|\bEsc V\b Previous              \| 
- \|\bkeymap\b  Change map  \|\b^K,\b Less                   \|\bEsc X bufed\b Switch          \| 
- \|                    \|\b^K.\b More                   \|                            \| 
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \i\|\uGOTO\u                 \|\uINDENT\u   \|\uCOMPILING\u          \uQUICK\u                       \|\i \i
+\i \i\|^G  Matching ( [ {   \|^K, less \|^[C Compile & parse ^G  find word under cursor \|\i \i
+\i \i\|^K- Previous place   \|^K. more \|^[G Grep & parse    ^[ENTER complete word      \|\i \i
+\i \i\|^K= Next place       \|\uFILE\u     \|^[= To next error   ^[Y paste deleted text     \|\i \i
+\i \i\|^K; Tags file search \|^K `     \|^[- To prev. error  ^[^Y cycle through deleted \|\i \i
+\i \i\|                     \| revert  \|^[ SP Jump to error                            \|\i \i
 }
 
-  Missing: Esc ~ not mod
-           Esc e parse errors in buffer
-           Esc ^Y   yank pop
-  
 {Search
- Search sequences:                                                            \| 
-     \b\\^  \\$\b  matches beg./end of line       \b\\.\b     match any single char      \| 
-     \b\\<  \\>\b  matches beg./end of word       \b\\!\b     match char or expression   \| 
-     \b\\(  \\)\b  grouping                       \b\\|\b     match left or right         \| 
-     \b\\[a-z]\b  matches one of a set           \b\\y \\Y\b  short for (.*) / (!*)       \| 
-     \b\\{1,3}\b  match 1 - 3 occurrences        \b\\?\b     match 0 or 1 occurrence     \| 
-     \b\\+\b      match 1 or more occurrences    \b\\*\b     match 0 or more occurrences \| 
-                                                                               \|
- \b^C\b    to abort                             \bEsc .\b  to list of escape sequences \|
-}
-
-{Escape sequences
- Escape sequences: \| 
-    \b\\x{10fff}\b Unicode code point    \b\\p{Ll}\b  Unicode category \| 
-    \b\\i\b / \b\\I\b   Identifier start      \b\\t\b  tab          \b\\e\b  escape               \| 
-    \b\\c\b / \b\\C\b   Identifier continue   \b\\n\b  newline      \b\\r\b  carriage return      \| 
-    \b\\d\b / \b\\D\b   Digit / Not a digit   \b\\b\b  backspace  \b\\xFF\b  hex character        \| 
-    \b\\w\b / \b\\W\b   Word / Not a word     \b\\a\b  alert      \b\\377\b  octal character      \| 
-    \b\\s\b / \b\\S\b   Space / Not a space   \b\\f\b  formfeed     \b\\\\\b  backslash            \| 
-  \|
-  \|
-}
-
-{Replace
- Replace sequences:                                                           \| 
-     \b\\&\b      replaced with entire match     \b\\1\b - \b9\b replaced with Nth group   \| 
-     \b\\u \\l\b   convert next to upper/lower    \b\\U \\L\b  case convert until \b\\E\b     \| 
-                                                                              \|
-                                                                              \|
- \|
- \|
- \|
- \b^C\b    to abort                             \bEsc ,\b to list of escape sequences \|
+\i   Help Screen    \|turn off with ^KH    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
 }
 
 {SearchOptions
- Search options:                                                              \| 
-      \br\b Replace      \bk\b Restrict search to highlighted block                   \| 
-      \bi\b Ignore case  \bb\b Search backwards instead of forwards                   \| 
-                     \ba\b Search across all loaded files                         \| 
-                     \be\b Search across all files in Grep or Compile error list  \| 
-  \bw\b / \bn\b  Allow / prevent wrap to start of file                                \| 
-  \bx\b / \by\b  Search text is standard format / JOE format regular expression       \| 
-    \bnnn\b  Perform exactly nnn replacements                                     \| 
- \b^C\b    to abort
+\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
 }
 
 {Math
-  \uMATH COMMANDS\u                  \uCONSTANTS\u                                \| 
-  \bhex oct bin\b display mode       \b0xff\b hex entry                           \| 
-  \beng dec\b engineering / normal   \b0o77\b octal entry                         \| 
-      \bins\b type result into file  \b0b11\b binary entry                        \| 
-     \beval\b evaluate block         \b3e-4\b floating point entry                \| 
-  2+3\b:\bins multiple commands      \uVARIABLES\u                                \| 
-  \uOPERATORS\u                      \bans\b  Previous result                     \| 
-  \b! ^  * / %  + -\b                \ba=10\b Assign a variable                   \| 
-  \b< <= > >= == !=  &&  ||  ? :\b   \bEsc .\b for list of functions              \| 
-}
-
-{Functions
-  \uFUNCTIONS\u                      \uCONSTANTS\u                                \| 
-  \bsin cos tab asin acos atan\b     \be pi\b                                     \| 
-  \bsinh cosh tanh asinh acosh atanh\b                                        \| 
-  \bsqrt cbrt exp ln log\b                                                    \| 
-  \bint floor ceil abs\b                                                      \| 
-  \berf erfc j0 j1 y0 y1\b                                                    \| 
-  \bjoe(..macro..)\b - runs an editor macro                                   \| 
-                                                                              \| 
-                                 \bEsc .\b for statistics                     \| 
-}
-
-{Statistics 
-  \uMATH COMMANDS\u                                                               \| 
-  Statistics on region of numbers  Linear regression on region of x y pairs   \| 
-  \bsum\b  Sum                         \blr(x)\b  Estimate y given x     y=m*x+b      \| 
-  \bcnt\b  Count                       \brlr(y)\b Estimate x given y                  \| 
-  \bavg\b  Mean                        \bLr rLr\b Logarithmic regression y=m*ln(x)+b  \| 
-    Standard deviation:            \blR rlR\b Exponential regression y=e^(m*x)+b  \| 
-  \bdev\b  all data present            \bLR rLR\b Power regression       y=b*x^m      \| 
-  \bsamp\b sample of data present      Side effects: \bb\b, \bm\b: regression coef.       \| 
-                                       \br\b: correlation coef., \bcov\b: covariance  \| 
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \i \uCOMMANDS\u (hit ESC m for math)  \uFUNCTIONS\u                                    \|\i \i
+\i \i     hex hex display mode       sin cos tab asin acos atan                   \|\i \i
+\i \i     dec decimal mode           sinh cosh tanh asinh acosh atanh             \|\i \i
+\i \i     ins type result into file  sqrt cbrt exp ln log                         \|\i \i
+\i \i    eval evaluate block         int floor ceil abs erg ergc                  \|\i \i
+\i \i    0xff enter number in hex    joe(..macro..) - runs an editor macro        \|\i \i
+\i \i    3e-4 floating point decimal \uBLOCK\u                                        \|\i \i
+\i \i    a=10 assign a variable      sum cnt  Sum, count                          \|\i \i
+\i \i 2+3:ins multiple commands      avg dev  Average, std. deviation             \|\i \i
+\i \i    e pi constants              \uOPERATORS\u                                    \|\i \i
+\i \i     ans previous result        ! ^  * / %  + -  < <= > >= == !=  &&  ||  ? :\|\i \i
 }
 
 {Names
-  Hit TAB to complete names.  Use up / down arrow keys to traverse history.   \| 
-  Special file names:                                                         \| 
-       \b!\bcommand                 Pipe in/out of a shell command                \| 
-       \b>>\bfilename               Append to a file                              \| 
-       \b-\b                        Read/Write to/from standard I/O               \|
-       filename\b,START,SIZE\b      Read/Write a part of a file/device            \| 
-           Give START/SIZE in decimal (255), octal (0377) or hex (0xFF)       \| 
-       \b\\,\b                       Use backslash to quote special characters     \|
- \b^C\b    to abort
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \i Hit TAB at file name prompts to generate menu of file names                 \|\i \i
+\i \i Or use up/down keys to access history of previously entered names           \|\i \i
+\i \i Special file names:                                                         \|\i \i
+\i \i      !command                 Pipe in/out of a shell command                \|\i \i
+\i \i      >>filename               Append to a file                              \|\i \i
+\i \i      -                        Read/Write to/from standard I/O               \|\i \i
+\i \i      filename,START,SIZE      Read/Write a part of a file/device            \|\i \i
+\i \i          Give START/SIZE in decimal (255), octal (0377) or hex (0xFF)       \|\i \i
 }
 
-{CharTable
- \| Dec  \u 0123 4567  8901 2345    0123 4567  8901 2345 \u  Dec \| 
- \|   0 | \u@ABC\u \uDEFG\u  \uHIJK\u \uLMNO\u    \i\u@ABC\u\i \i\uDEFG\u\i  \i\uHIJK\u\i \i\uLMNO\u\i | 128 \| 
- \|  16 | \uPQRS\u \uTUVW\u  \uXYZ[\u \u\\]^_\u    \i\uPQRS\u\i \i\uTUVW\u\i  \i\uXYZ[\u\i \i\u\\]^_\u\i | 144 \| 
- \|  32 |  !"# $%&'  ()*+ ,-./     ¡¢£ ¤¥¦§  ¨©ª« ¬X®¯ | 160 \| 
- \|  48 | 0123 4567  89:; <=>?    °±²³ ´µ¶·  ¸¹º» ¼½¾¿ | 176 \| 
- \|  64 | @ABC DEFG  HIJK LMNO    ÀÁÂÃ ÄÅÆÇ  ÈÉÊË ÌÍÎÏ | 192 \| 
- \|  80 | PQRS TUVW  XYZ[ \\]^_    ÐÑÒÓ ÔÕÖ×  ØÙÚÛ ÜÝÞß | 208 \| 
- \|  96 | `abc defg  hijk lmno    àáâã äåæç  èéêë ìíîï | 224 \| 
- \| 112 | pqrs tuvw  xyz{ |}~    ðñòó ôõö÷  øùúû üýþÿ | 240 \| 
+{Joe
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
+\i \i Send bug reports to: http://sourceforge.net/projects/joe-editor \|\i \i
+\i \i \|\i \i
+\i \i  default joerc file is here /etc/joe/joerc \|\i \i
+\i \i  default syntax and i18n files are here /usr/share/joe \|\i \i
+\i \i  additional documentation can be found here /usr/share/doc/joe \|\i \i
 }
 
-{Joe
-  Send bug reports to: http://sourceforge.net/projects/joe-editor \| 
-  \| 
-   default joerc file is here /etc/joe/joerc \| 
-   default syntax and i18n files are here /usr/share/joe \| 
-   additional documentation can be found here /usr/share/doc/joe \| 
-  \| 
-  \| 
-  \| 
-  \| 
+{CharTable
+\i   Help Screen    \|turn off with ^KH    prev. screen ^[,                        \i
+\i \i\| Dec  \u 0123 4567  8901 2345    0123 4567  8901 2345 \u  Dec \|\i \i
+\i \i\|     |                                              |     \|\i \i
+\i \i\|   0 | \u@ABC\u \uDEFG\u  \uHIJK\u \uLMNO\u    \i\u@ABC\u\i \i\uDEFG\u\i  \i\uHIJK\u\i \i\uLMNO\u\i | 128 \|\i \i
+\i \i\|  16 | \uPQRS\u \uTUVW\u  \uXYZ[\u \u\\]^_\u    \i\uPQRS\u\i \i\uTUVW\u\i  \i\uXYZ[\u\i \i\u\\]^_\u\i | 144 \|\i \i
+\i \i\|  32 |  !"# $%&'  ()*+ ,-./     ¡¢£ ¤¥¦§  ¨©ª« ¬­®¯ | 160 \|\i \i
+\i \i\|  48 | 0123 4567  89:; <=>?    °±²³ ´µ¶·  ¸¹º» ¼½¾¿ | 176 \|\i \i
+\i \i\|  64 | @ABC DEFG  HIJK LMNO    ÀÁÂÃ ÄÅÆÇ  ÈÉÊË ÌÍÎÏ | 192 \|\i \i
+\i \i\|  80 | PQRS TUVW  XYZ[ \\]^_    ÐÑÒÓ ÔÕÖ×  ØÙÚÛ ÜÝÞß | 208 \|\i \i
+\i \i\|  96 | `abc defg  hijk lmno    àáâã äåæç  èéêë ìíîï | 224 \|\i \i
+\i \i\| 112 | pqrs tuvw  xyz{ |}~    ðñòó ôõö÷  øùúû üýþÿ | 240 \|\i \i
 }
 
  FOURTH SECTION: Key bindings:
@@ -749,8 +641,6 @@ mode,"spaces",rtn	% % No tabs %Zspaces%
 	:query		For single-character query lines
 	:querya		Singe-character query for quote
 	:querysr	Search & Replace single-character query
-	:shell		For shell windows
-	:vtshell	For terminal emulator windows
 
  Other sections may be given as well for organization purposes or for
  use with the '-keymap' option.
@@ -761,7 +651,6 @@ mode,"spaces",rtn	% % No tabs %Zspaces%
 
  Keys:
 
- Use U+12345 for specific unicode character
  Use ^@ through ^_ and ^? for Ctrl chars
  Use SP for space
  Use a TO b to generate a range of characters
@@ -805,18 +694,12 @@ mode,"spaces",rtn	% % No tabs %Zspaces%
 
  To define a command foo which will goto the beginning of the last line.
 
- Recenter
-:def recenter retype,arg,"top+height/2-line",rtn,upslide
-
 :windows		Bindings common to all windows
-type		U+0 TO U+10FFFF
+type		^@ TO ÿ		Type a character
 abort		^C		Abort window
- abort		^K Q
- abort		^K ^Q
- abort		^K q
-querysave,query,killjoe	^K Q	Query to save files, then exit
-querysave,query,killjoe	^K ^Q
-querysave,query,killjoe	^K q
+abort		^K Q
+abort		^K ^Q
+abort		^K q
 arg		^K \		Repeat next command
 explode		^K I		Show all windows or show only one window
 explode		^K ^I
@@ -849,8 +732,7 @@ prevw		^K ^P
 prevw		^K p
 query		^K ?		Macro query insert
 record		^K [		Record a macro
- retype		^R		Refresh screen
- recenter	^R		Recenter and refresh screen
+retype		^R		Refresh screen
 rtn		^M		Return
 shell		^K Z		Shell escape
 shell		^K ^Z
@@ -866,14 +748,10 @@ defm2drag	M2DRAG		Select a region of words
 defm3down	M3DOWN		Select the line at the mouse location
 defm3up		M3UP
 defm3drag	M3DRAG		Select a region of lines
-defmiddleup	MIDDLEUP
-defmiddledown	MIDDLEDOWN	Insert text
 
 xtmouse		^[ [ M		Introduces an xterm mouse event
-extmouse	^[ [ <		Introduces an extended xterm mouse event
 
- Sample if/then/else macro
- if,"char==65",then,"it's an A",else,"it's not an a",endif	^[ q
+if,"char==65",then,"it's an A",else,"it's not an a",endif	^[ q
 
 :main			Text editing window
 :inherit windows
@@ -904,44 +782,11 @@ aspellword	^[ 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_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
-:def shell_parse parserr
-:def shell_gparse gparse
-:def shell_release release
-:def shell_math maths
-:def shell_abort abort
-:def shell_typemath txt,maths,"ins",rtn,rtn,txt,"
",rtn,txt,quote,"d",rtn
-:def shell_rtn rtn
-:def shell_edit edit
-:def shell_dellin dellin
-:def shell_cd cd
-:def shell_pop popabort
-:def shell_markb markb
-:def shell_markk markk
-
- Split window version
- :def shell1 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 1 *",rtn,vtbknd!,eof
- :def shell2 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 2 *",rtn,vtbknd!,eof
- :def shell3 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 3 *",rtn,vtbknd!,eof
- :def shell4 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 4 *",rtn,vtbknd!,eof
-
-
  Here we guess some common key sequences which either do not have termcap
  sequences or which are frequently wrong.  Note that if the termcap entry is
  correct, it will override these later on.
 
-paste			^[ ] 5 2 ;		Base64 paste (obsolete)
-brpaste			^[ [ 2 0 0 ~		Bracketed paste
-brpaste_done		^[ [ 2 0 1 ~		Bracketed paste done
+paste			^[ ] 5 2 ;		Bracketed paste
 
 insc			^[ [ 2 ~
 insc			^[ [ L			SCO
@@ -1010,11 +855,10 @@ execmd		^[ X		Prompt for command to execute
 execmd		^[ ^X		Prompt for command to execute
 finish		^[ ^I		Complete word in document
 finish		^[ ^M		Complete word: used to be math
-mwind!,mfit,jump,bol		^[ SP
+mwind,mfit,jump,bol		^[ SP
 isrch		^[ s		Forward incremental search
 isrch		^[ S		Forward incremental search
 isrch		^[ ^S		Forward incremental search
-isrch		^S
 notmod		^[ ~		Not modified
 mwind,mfit,prevw,nxterr		^[ =		To next error
 parserr		^[ e		Parse errors in current buffer
@@ -1024,7 +868,6 @@ mwind,mfit,prevw,prverr		^[ -		To previous error
 rsrch		^[ r		Backward incremental search
 rsrch		^[ R		Backward incremental search
 rsrch		^[ ^R		Backward incremental search
-retype,rsrch	^R
 run		^[ !		Run a program in a window
 tomarkb		^[ b		Go to beginning of marked block
 tomarkb		^[ ^B		Go to beginning of marked block
@@ -1110,9 +953,7 @@ center		^K A		Center line
 center		^K ^A
 center		^K a
 crawll		^K <		Pan left
-crawll		^[ <		Pan left
 crawlr		^K >		Pan right
-crawlr		^[ >		Pan right
 delch		.kD		Delete character
 delch		^D
 deleol		^J		Delete to end of line
@@ -1200,7 +1041,6 @@ splitw		^K O		Split window
 splitw		^K ^O
 splitw		^K o
 stat		^K SP		Show status
-stat		^K ^@		Show status
 tag		^K ;		Tags file search
 tomatch		^G		Goto matching parenthasis
 undo		^_		Undo changes
@@ -1209,22 +1049,6 @@ uparw		.ku		Go up
 uparw		^P
 uparw		^[ O A
 uparw		^[ [ A
-shell1		^[ [ 1 1 ~
-shell1		^[ O P
-shell1		^[ [ [ A
-shell1		.k1
-shell2		^[ [ 1 2 ~
-shell2		^[ O Q
-shell2		^[ [ [ B
-shell2		.k2
-shell3		^[ [ 1 3 ~
-shell3		^[ O R
-shell3		^[ [ [ C
-shell3		.k3
-shell4		^[ [ 1 4 ~
-shell4		^[ O S
-shell4		^[ [ [ D
-shell4		.k4
 
 :prompt			Prompt windows
 :inherit main
@@ -1315,35 +1139,7 @@ defm2down	M2DOWN		Hits return key
 :inherit windows
 
 :querya			Single-key query window for quoting
-type		U+0 TO U+10FFFF
+type		^@ TO ÿ
 
 :querysr		Search & replace query window
-type		U+0 TO U+10FFFF
-
-:shell			Input to shell windows
-:inherit main
-""		^C		Abort
-""		^D		Eof
-"	"	^I		Tab
-""		^H		Backspace
-"
"		^M		Return
-""		^?		Backspace
-
-:vtshell		Input to ANSI shell windows
-:inherit main
-""		 [ A
-""		.ku
-""		 [ B
-""		.kd
-""		 [ C
-""		.kr
-""		 [ D
-""		.kl
-"
"		^A		BOL for bash
-""		^C		Abort
-""		^D		Eof
-""		^E		EOL for bash
-"	"	^I		Tab
-""		^H		Backspace
-"
"		^M		Return
-""		^?		Backspace
+type		^@ TO ÿ