[w3m-dev 03567] default keybinding

* doc-jp/keymap.default (C-q,C-t,(,),+,-,D,L,T,m,r,{,|,},
			M-c,M-k,M-l,M-m,M-o,M-t): assign
* doc/keymap.default: ditto
* keybind.c: ditto
* doc-jp/keymap.lynx (C-q,C-t,C-u,(,),,,.,;,D,L,T,W,[,],
			m,r,w,{,|,},M-<,M->,M-W,M-c,M-g,
			M-k,M-l,M-m,M-n,M-o,M-p,M-t,M-w): assign
* doc/keymap.lynx: ditto
* keybind_lynx.c: ditto
* doc-jp/menu.default (Main): Select,SelectTab,TAB_LINK
* doc/menu.default: ditto
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

9 files changed, 163 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 3458563..68ce5f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2002-12-13  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03567] default keybinding
+	* doc-jp/keymap.default (C-q,C-t,(,),+,-,D,L,T,m,r,{,|,},
+				M-c,M-k,M-l,M-m,M-o,M-t): assign
+	* doc/keymap.default: ditto
+	* keybind.c: ditto
+	* doc-jp/keymap.lynx (C-q,C-t,C-u,(,),,,.,;,D,L,T,W,[,],
+				m,r,w,{,|,},M-<,M->,M-W,M-c,M-g,
+				M-k,M-l,M-m,M-n,M-o,M-p,M-t,M-w): assign
+	* doc/keymap.lynx: ditto
+	* keybind_lynx.c: ditto
+	* doc-jp/menu.default (Main): Select,SelectTab,TAB_LINK
+	* doc/menu.default: ditto
+
+2002-12-13  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03566] configure prefix
 	* configure: add X prefix for expr args
 
@@ -5815,4 +5830,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.617 2002/12/13 02:27:23 ukai Exp $
+$Id: ChangeLog,v 1.618 2002/12/13 03:02:03 ukai Exp $
diff --git a/doc-jp/keymap.default b/doc-jp/keymap.default
index 7acbb47..b3fc59d 100644
--- a/doc-jp/keymap.default
+++ b/doc-jp/keymap.default
@@ -24,8 +24,10 @@ keymap	C-l	REDRAW
 keymap	C-m	GOTO_LINK
 keymap	C-n	MOVE_DOWN
 keymap	C-p	MOVE_UP
+keymap	C-q	CLOSE_TAB
 keymap	C-r	ISEARCH_BACK
 keymap	C-s	ISEARCH
+keymap	C-t	TAB_LINK
 keymap	C-u	PREV_LINK
 keymap	C-v	NEXT_PAGE
 keymap	C-w	WRAP_TOGGLE
@@ -36,7 +38,11 @@ keymap	!	SHELL
 keymap	\"	REG_MARK
 keymap	#	PIPE_SHELL
 keymap	$	LINE_END
+keymap	(	UNDO
+keymap	)	REDO
+keymap	+	NEXT_PAGE
 keymap	,	LEFT
+keymap	-	PREV_PAGE
 keymap	.	RIGHT
 keymap	/	SEARCH
 keymap	:	MARK_URL
@@ -47,6 +53,7 @@ keymap	>	SHIFT_RIGHT
 keymap	?	SEARCH_BACK
 keymap	@	READ_SHELL
 keymap	B	BACK
+keymap	D	DOWNLOAD_LIST
 keymap	E	EDIT
 keymap	F	FRAME
 keymap	G	END
@@ -54,11 +61,13 @@ keymap	H	HELP
 keymap	I	VIEW_IMAGE
 keymap	J	UP
 keymap	K	DOWN
+keymap	L	LIST
 keymap	M	EXTERN
 keymap	N	SEARCH_PREV
 keymap	Q	EXIT
 keymap	R	RELOAD
 keymap	S	SAVE_SCREEN
+keymap	T	NEW_TAB
 keymap	U	GOTO
 keymap	V	LOAD
 keymap	W	PREV_WORD
@@ -75,14 +84,19 @@ keymap	i	PEEK_IMG
 keymap	j	MOVE_DOWN
 keymap	k	MOVE_UP
 keymap	l	MOVE_RIGHT
+keymap	m	MOUSE_TOGGLE
 keymap	n	SEARCH_NEXT
 keymap	o	OPTIONS
 keymap	q	QUIT
-keymap s       SELECT_MENU
+keymap	r	VERSION
+keymap	s	SELECT_MENU
 keymap	u	PEEK_LINK
 keymap	v	VIEW
 keymap	w	NEXT_WORD
 keymap	z	CENTER_V
+keymap	{	PREV_TAB
+keymap	|	PIPE_BUF
+keymap	}	NEXT_TAB
 
 keymap	M-TAB	PREV_LINK
 keymap	M-C-j	SAVE_LINK
@@ -96,11 +110,17 @@ keymap	M-M	EXTERN_LINK
 keymap	M-W	DICT_WORD_AT
 keymap	M-a	ADD_BOOKMARK
 keymap	M-b	BOOKMARK
+keymap	M-c	COMMAND
 keymap	M-e	EDIT_SCREEN
 keymap	M-g	GOTO_LINE
+keymap	M-k	DEFINE_KEY
+keymap	M-l	LIST_MENU
+keymap	M-m	MOVE_LIST_MENU
 keymap	M-n	NEXT_MARK
+keymap	M-o	SET_OPTION
 keymap	M-p	PREV_MARK
 keymap	M-s	SAVE
+keymap	M-t	TAB_MENU
 keymap	M-u	GOTO_RELATIVE
 keymap	M-v	PREV_PAGE
 keymap	M-w	DICT_WORD
diff --git a/doc-jp/keymap.lynx b/doc-jp/keymap.lynx
index c811e94..869c716 100644
--- a/doc-jp/keymap.lynx
+++ b/doc-jp/keymap.lynx
@@ -24,8 +24,11 @@ keymap	C-l	REDRAW
 keymap	C-m	GOTO_LINK
 keymap	C-n	NEXT_LINK
 keymap	C-p	PREV_LINK
+keymap	C-q	CLOSE_TAB
 keymap	C-r	RELOAD
 keymap	C-s	SEARCH
+keymap	C-t	TAB_LINK
+keymap	C-u	PREV_LINK
 keymap	C-v	NEXT_PAGE
 keymap	C-w	REDRAW
 keymap	C-z	SUSPEND
@@ -35,16 +38,22 @@ keymap	!	SHELL
 keymap	\"	REG_MARK
 keymap	#	PIPE_SHELL
 keymap	$	LINE_END
+keymap	(	UNDO
+keymap	)	REDO
 keymap	+	NEXT_PAGE
+keymap	,	LEFT
 keymap	-	PREV_PAGE
+keymap	.	RIGHT
 keymap	/	SEARCH
 keymap	:	MARK_URL
+keymap	;	MARK_WORD
 keymap	<	SHIFT_LEFT
 keymap	=	INFO
 keymap	>	SHIFT_RIGHT
 keymap	?	HELP
 keymap	@	READ_SHELL
 keymap	B	BACK
+keymap	D	DOWNLOAD_LIST
 keymap	E	EDIT
 keymap	F	FRAME
 keymap	G	GOTO_LINE
@@ -52,16 +61,21 @@ keymap	H	HELP
 keymap	I	VIEW_IMAGE
 keymap	J	UP
 keymap	K	DOWN
+keymap	L	LIST
 keymap	M	EXTERN
 keymap	N	NEXT_MARK
 keymap	P	PREV_MARK
 keymap	Q	EXIT
 keymap	R	RELOAD
 keymap	S	SAVE_SCREEN
+keymap	T	NEW_TAB
 keymap	U	GOTO
 keymap	V	LOAD
+keymap	W	PREV_WORD
 keymap	Z	CENTER_H
+keymap	[	LINK_BEGIN
 keymap	\\	SOURCE
+keymap	]	LINK_END
 keymap	\^	LINE_BEGIN
 keymap	a	ADD_BOOKMARK
 keymap	b	PREV_PAGE
@@ -73,29 +87,47 @@ keymap	i	PEEK_IMG
 keymap	j	MOVE_DOWN
 keymap	k	MOVE_UP
 keymap	l	MOVE_RIGHT
+keymap	m	MOUSE_TOGGLE
 keymap	n	SEARCH_NEXT
 keymap	o	OPTIONS
 keymap	p	SAVE_SCREEN
 keymap	q	QUIT
-keymap s       SELECT_MENU
+keymap	r	VERSION
+keymap	s	SELECT_MENU
 keymap	u	PEEK_LINK
 keymap	v	BOOKMARK
-keymap	w	WRAP_TOGGLE
+keymap	w	NEXT_WORD
 keymap	z	CENTER_V
+keymap	{	PREV_TAB
+keymap	|	PIPE_BUF
+keymap	}	NEXT_TAB
 
 keymap	M-TAB	PREV_LINK
 keymap	M-C-j	SAVE_LINK
 keymap	M-C-m	SAVE_LINK
 
 keymap	M-:	MARK_MID
+keymap	M-<	BEGIN
+keymap	M->	END
 keymap	M-I	SAVE_IMAGE
 keymap	M-M	EXTERN_LINK
+keymap	M-W	DICT_WORD_AT
 keymap	M-a	ADD_BOOKMARK
 keymap	M-b	BOOKMARK
+keymap	M-c	COMMAND
 keymap	M-e	EDIT_SCREEN
+keymap	M-g	GOTO_LINE
+keymap	M-k	DEFINE_KEY
+keymap	M-l	LIST_MENU
+keymap	M-m	MOVE_LIST_MENU
+keymap	M-n	NEXT_MARK
+keymap	M-o	SET_OPTION
+keymap	M-p	PREV_MARK
 keymap	M-s	SAVE
+keymap	M-t	TAB_MENU
 keymap	M-u	GOTO_RELATIVE
 keymap	M-v	PREV_PAGE
+keymap	M-w	DICT_WORD
 
 keymap	UP	PREV_LINK
 keymap	DOWN	NEXT_LINK
diff --git a/doc-jp/menu.default b/doc-jp/menu.default
index b17dad2..67f0361 100644
--- a/doc-jp/menu.default
+++ b/doc-jp/menu.default
@@ -12,13 +12,15 @@
 
 menu Main
  func	"戻る         (b)"	BACK		"b"
- func	"バッファ選択 (s)"	SELECT		"s"
+ popup	"バッファ選択 (s)"	Select		"s"
+ popup	"タブ選択     (t)"	SelectTab	"tT"
  func	"ソースを表示 (v)"	VIEW		"vV"
  func	"ソースを編集 (e)"	EDIT		"eE"
  func	"ソースを保存 (S)"	SAVE		"S"
  func	"再読み込み   (r)"	RELOAD		"rR"
  nop	"────────"
  func	"リンクを表示 (a)"	GOTO_LINK	"a"
+ func	"新タブで表示 (n)"	TAB_LINK	"nN"
  func	"リンクを保存 (A)"	SAVE_LINK	"A"
  func	"画像を表示   (i)"	VIEW_IMAGE	"i"
  func	"画像を保存   (I)"	SAVE_IMAGE	"I"
diff --git a/doc/keymap.default b/doc/keymap.default
index 17ce41a..b3fc59d 100644
--- a/doc/keymap.default
+++ b/doc/keymap.default
@@ -24,8 +24,10 @@ keymap	C-l	REDRAW
 keymap	C-m	GOTO_LINK
 keymap	C-n	MOVE_DOWN
 keymap	C-p	MOVE_UP
+keymap	C-q	CLOSE_TAB
 keymap	C-r	ISEARCH_BACK
 keymap	C-s	ISEARCH
+keymap	C-t	TAB_LINK
 keymap	C-u	PREV_LINK
 keymap	C-v	NEXT_PAGE
 keymap	C-w	WRAP_TOGGLE
@@ -36,17 +38,22 @@ keymap	!	SHELL
 keymap	\"	REG_MARK
 keymap	#	PIPE_SHELL
 keymap	$	LINE_END
+keymap	(	UNDO
+keymap	)	REDO
+keymap	+	NEXT_PAGE
 keymap	,	LEFT
+keymap	-	PREV_PAGE
 keymap	.	RIGHT
 keymap	/	SEARCH
 keymap	:	MARK_URL
-keymap  ;	MARK_WORD
+keymap	;	MARK_WORD
 keymap	<	SHIFT_LEFT
 keymap	=	INFO
 keymap	>	SHIFT_RIGHT
 keymap	?	SEARCH_BACK
 keymap	@	READ_SHELL
 keymap	B	BACK
+keymap	D	DOWNLOAD_LIST
 keymap	E	EDIT
 keymap	F	FRAME
 keymap	G	END
@@ -54,11 +61,13 @@ keymap	H	HELP
 keymap	I	VIEW_IMAGE
 keymap	J	UP
 keymap	K	DOWN
+keymap	L	LIST
 keymap	M	EXTERN
 keymap	N	SEARCH_PREV
 keymap	Q	EXIT
 keymap	R	RELOAD
 keymap	S	SAVE_SCREEN
+keymap	T	NEW_TAB
 keymap	U	GOTO
 keymap	V	LOAD
 keymap	W	PREV_WORD
@@ -75,14 +84,19 @@ keymap	i	PEEK_IMG
 keymap	j	MOVE_DOWN
 keymap	k	MOVE_UP
 keymap	l	MOVE_RIGHT
+keymap	m	MOUSE_TOGGLE
 keymap	n	SEARCH_NEXT
 keymap	o	OPTIONS
 keymap	q	QUIT
-keymap s       SELECT_MENU
+keymap	r	VERSION
+keymap	s	SELECT_MENU
 keymap	u	PEEK_LINK
 keymap	v	VIEW
 keymap	w	NEXT_WORD
 keymap	z	CENTER_V
+keymap	{	PREV_TAB
+keymap	|	PIPE_BUF
+keymap	}	NEXT_TAB
 
 keymap	M-TAB	PREV_LINK
 keymap	M-C-j	SAVE_LINK
@@ -96,11 +110,17 @@ keymap	M-M	EXTERN_LINK
 keymap	M-W	DICT_WORD_AT
 keymap	M-a	ADD_BOOKMARK
 keymap	M-b	BOOKMARK
+keymap	M-c	COMMAND
 keymap	M-e	EDIT_SCREEN
 keymap	M-g	GOTO_LINE
+keymap	M-k	DEFINE_KEY
+keymap	M-l	LIST_MENU
+keymap	M-m	MOVE_LIST_MENU
 keymap	M-n	NEXT_MARK
+keymap	M-o	SET_OPTION
 keymap	M-p	PREV_MARK
 keymap	M-s	SAVE
+keymap	M-t	TAB_MENU
 keymap	M-u	GOTO_RELATIVE
 keymap	M-v	PREV_PAGE
 keymap	M-w	DICT_WORD
diff --git a/doc/keymap.lynx b/doc/keymap.lynx
index c811e94..869c716 100644
--- a/doc/keymap.lynx
+++ b/doc/keymap.lynx
@@ -24,8 +24,11 @@ keymap	C-l	REDRAW
 keymap	C-m	GOTO_LINK
 keymap	C-n	NEXT_LINK
 keymap	C-p	PREV_LINK
+keymap	C-q	CLOSE_TAB
 keymap	C-r	RELOAD
 keymap	C-s	SEARCH
+keymap	C-t	TAB_LINK
+keymap	C-u	PREV_LINK
 keymap	C-v	NEXT_PAGE
 keymap	C-w	REDRAW
 keymap	C-z	SUSPEND
@@ -35,16 +38,22 @@ keymap	!	SHELL
 keymap	\"	REG_MARK
 keymap	#	PIPE_SHELL
 keymap	$	LINE_END
+keymap	(	UNDO
+keymap	)	REDO
 keymap	+	NEXT_PAGE
+keymap	,	LEFT
 keymap	-	PREV_PAGE
+keymap	.	RIGHT
 keymap	/	SEARCH
 keymap	:	MARK_URL
+keymap	;	MARK_WORD
 keymap	<	SHIFT_LEFT
 keymap	=	INFO
 keymap	>	SHIFT_RIGHT
 keymap	?	HELP
 keymap	@	READ_SHELL
 keymap	B	BACK
+keymap	D	DOWNLOAD_LIST
 keymap	E	EDIT
 keymap	F	FRAME
 keymap	G	GOTO_LINE
@@ -52,16 +61,21 @@ keymap	H	HELP
 keymap	I	VIEW_IMAGE
 keymap	J	UP
 keymap	K	DOWN
+keymap	L	LIST
 keymap	M	EXTERN
 keymap	N	NEXT_MARK
 keymap	P	PREV_MARK
 keymap	Q	EXIT
 keymap	R	RELOAD
 keymap	S	SAVE_SCREEN
+keymap	T	NEW_TAB
 keymap	U	GOTO
 keymap	V	LOAD
+keymap	W	PREV_WORD
 keymap	Z	CENTER_H
+keymap	[	LINK_BEGIN
 keymap	\\	SOURCE
+keymap	]	LINK_END
 keymap	\^	LINE_BEGIN
 keymap	a	ADD_BOOKMARK
 keymap	b	PREV_PAGE
@@ -73,29 +87,47 @@ keymap	i	PEEK_IMG
 keymap	j	MOVE_DOWN
 keymap	k	MOVE_UP
 keymap	l	MOVE_RIGHT
+keymap	m	MOUSE_TOGGLE
 keymap	n	SEARCH_NEXT
 keymap	o	OPTIONS
 keymap	p	SAVE_SCREEN
 keymap	q	QUIT
-keymap s       SELECT_MENU
+keymap	r	VERSION
+keymap	s	SELECT_MENU
 keymap	u	PEEK_LINK
 keymap	v	BOOKMARK
-keymap	w	WRAP_TOGGLE
+keymap	w	NEXT_WORD
 keymap	z	CENTER_V
+keymap	{	PREV_TAB
+keymap	|	PIPE_BUF
+keymap	}	NEXT_TAB
 
 keymap	M-TAB	PREV_LINK
 keymap	M-C-j	SAVE_LINK
 keymap	M-C-m	SAVE_LINK
 
 keymap	M-:	MARK_MID
+keymap	M-<	BEGIN
+keymap	M->	END
 keymap	M-I	SAVE_IMAGE
 keymap	M-M	EXTERN_LINK
+keymap	M-W	DICT_WORD_AT
 keymap	M-a	ADD_BOOKMARK
 keymap	M-b	BOOKMARK
+keymap	M-c	COMMAND
 keymap	M-e	EDIT_SCREEN
+keymap	M-g	GOTO_LINE
+keymap	M-k	DEFINE_KEY
+keymap	M-l	LIST_MENU
+keymap	M-m	MOVE_LIST_MENU
+keymap	M-n	NEXT_MARK
+keymap	M-o	SET_OPTION
+keymap	M-p	PREV_MARK
 keymap	M-s	SAVE
+keymap	M-t	TAB_MENU
 keymap	M-u	GOTO_RELATIVE
 keymap	M-v	PREV_PAGE
+keymap	M-w	DICT_WORD
 
 keymap	UP	PREV_LINK
 keymap	DOWN	NEXT_LINK
diff --git a/doc/menu.default b/doc/menu.default
index 3e45d1c..43c8341 100644
--- a/doc/menu.default
+++ b/doc/menu.default
@@ -12,7 +12,8 @@
 
 menu Main
   func   " Back         (b) "  BACK		"b"
-  func   " Select Buffer(s) "  SELECT		"s"
+  popup  " Select Buffer(s) "  Select		"s"
+  popup  " Select Tab   (t) "  SelectTab	"tT"
   func   " View Source  (v) "  VIEW		"vV"
   func   " Edit Source  (e) "  EDIT		"eE"
   func   " Save Source  (S) "  SAVE		"S"
@@ -20,6 +21,7 @@ menu Main
   nop    " -----------------"  
 
   func   " Go Link      (a) "  GOTO_LINK	"a"
+  func   "   on New Tab (n) "  TAB_LINK		"nN"
   func   " Save Link    (A) "  SAVE_LINK	"A"
   func   " View Image   (i) "  VIEW_IMAGE	"i"
   func   " Save Image   (I) "  SAVE_IMAGE	"I"
diff --git a/keybind.c b/keybind.c
index 275dd8d..6224b44 100644
--- a/keybind.c
+++ b/keybind.c
@@ -1,4 +1,4 @@
-/* $Id: keybind.c,v 1.8 2002/11/11 15:22:40 ukai Exp $ */
+/* $Id: keybind.c,v 1.9 2002/12/13 03:02:03 ukai Exp $ */
 #include "funcname2.h"
 
 unsigned char GlobalKeymap[128] = {
@@ -11,33 +11,33 @@ unsigned char GlobalKeymap[128] = {
     /*  C-h     C-i     C-j     C-k     C-l     C-m     C-n     C-o      */
     ldHist, nextA, followA, cooLst, rdrwSc, followA, movD, nulcmd,
     /*  C-p     C-q     C-r     C-s     C-t     C-u     C-v     C-w      */
-    movU, nulcmd, isrchbak, isrchfor, nulcmd, prevA, pgFore, wrapToggle,
+    movU, closeT, isrchbak, isrchfor, tabA, prevA, pgFore, wrapToggle,
     /*  C-x     C-y     C-z     C-[     C-\     C-]     C-^     C-_      */
     nulcmd, nulcmd, susp, escmap, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  SPC     !       "       #       $       %       &       '        */
     pgFore, execsh, reMark, pipesh, linend, nulcmd, nulcmd, nulcmd,
     /*  (       )       *       +       ,       -       .       /        */
-    nulcmd, nulcmd, nulcmd, nulcmd, col1L, nulcmd, col1R, srchfor,
+    undoPos, redoPos, nulcmd, pgFore, col1L, pgBack, col1R, srchfor,
     /*  0       1       2       3       4       5       6       7        */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  8       9       :       ;       <       =       >       ?        */
     nulcmd, nulcmd, chkURL, chkWORD, shiftl, pginfo, shiftr, srchbak,
     /*  @       A       B       C       D       E       F       G        */
-    readsh, nulcmd, backBf, nulcmd, nulcmd, editBf, rFrame, goLineL,
+    readsh, nulcmd, backBf, nulcmd, ldDL, editBf, rFrame, goLineL,
     /*  H       I       J       K       L       M       N       O        */
-    ldhelp, followI, lup1, ldown1, nulcmd, extbrz, srchprv, nulcmd,
+    ldhelp, followI, lup1, ldown1, linkLst, extbrz, srchprv, nulcmd,
     /*  P       Q       R       S       T       U       V       W        */
-    nulcmd, quitfm, reload, svBuf, nulcmd, goURL, ldfile, movLW,
+    nulcmd, quitfm, reload, svBuf, newT, goURL, ldfile, movLW,
     /*  X       Y       Z       [       \       ]       ^       _        */
     nulcmd, nulcmd, ctrCsrH, topA, nulcmd, lastA, linbeg, nulcmd,
     /*  `       a       b       c       d       e       f       g        */
     nulcmd, svA, pgBack, curURL, nulcmd, nulcmd, nulcmd, goLineF,
     /*  h       i       j       k       l       m       n       o        */
-    movL, peekIMG, movD, movU, movR, nulcmd, srchnxt, ldOpt,
+    movL, peekIMG, movD, movU, movR, msToggle, srchnxt, ldOpt,
     /*  p       q       r       s       t       u       v       w        */
-    nulcmd, qquitfm, nulcmd, selMn, nulcmd, peekURL, vwSrc, movRW,
+    nulcmd, qquitfm, dispVer, selMn, nulcmd, peekURL, vwSrc, movRW,
     /*  x       y       z       {       |       }       ~       DEL      */
-    nulcmd, nulcmd, ctrCsrV, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
+    nulcmd, nulcmd, ctrCsrV, prevT, pipeBuf, nextT, nulcmd, nulcmd,
 };
 
 unsigned char EscKeymap[128] = {
@@ -66,11 +66,11 @@ unsigned char EscKeymap[128] = {
     /*  X       Y       Z       [       \       ]       ^       _        */
     nulcmd, nulcmd, nulcmd, escbmap, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  `       a       b       c       d       e       f       g        */
-    nulcmd, adBmark, ldBmark, nulcmd, nulcmd, editScr, nulcmd, goLine,
+    nulcmd, adBmark, ldBmark, execCmd, nulcmd, editScr, nulcmd, goLine,
     /*  h       i       j       k       l       m       n       o        */
-    nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nextMk, nulcmd,
+    nulcmd, nulcmd, nulcmd, defKey, listMn, movlistMn, nextMk, setOpt,
     /*  p       q       r       s       t       u       v       w        */
-    prevMk, nulcmd, nulcmd, svSrc, nulcmd, gorURL, pgBack, dictword,
+    prevMk, nulcmd, nulcmd, svSrc, tabMn, gorURL, pgBack, dictword,
     /*  x       y       z       {       |       }       ~       DEL      */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
 };
diff --git a/keybind_lynx.c b/keybind_lynx.c
index f76b171..065d008 100644
--- a/keybind_lynx.c
+++ b/keybind_lynx.c
@@ -1,4 +1,4 @@
-/* $Id: keybind_lynx.c,v 1.6 2002/11/11 15:22:40 ukai Exp $ */
+/* $Id: keybind_lynx.c,v 1.7 2002/12/13 03:02:03 ukai Exp $ */
 /* 
  * Lynx-like key binding.
  *
@@ -19,33 +19,33 @@ unsigned char GlobalKeymap[128] = {
     /*  C-h     C-i     C-j     C-k     C-l     C-m     C-n     C-o      */
     ldHist, nextA, followA, cooLst, rdrwSc, followA, nextA, nulcmd,
     /*  C-p     C-q     C-r     C-s     C-t     C-u     C-v     C-w      */
-    prevA, nulcmd, reload, srchfor, nulcmd, nulcmd, pgFore, rdrwSc,
+    prevA, closeT, reload, srchfor, tabA, prevA, pgFore, rdrwSc,
     /*  C-x     C-y     C-z     C-[     C-\     C-]     C-^     C-_      */
     nulcmd, nulcmd, susp, escmap, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  SPC     !       "       #       $       %       &       '        */
     pgFore, execsh, reMark, pipesh, linend, nulcmd, nulcmd, nulcmd,
     /*  (       )       *       +       ,       -       .       /        */
-    nulcmd, nulcmd, nulcmd, pgFore, nulcmd, pgBack, nulcmd, srchfor,
+    undoPos, redoPos, nulcmd, pgFore, col1L, pgBack, col1R, srchfor,
     /*  0       1       2       3       4       5       6       7        */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  8       9       :       ;       <       =       >       ?        */
-    nulcmd, nulcmd, chkURL, nulcmd, shiftl, pginfo, shiftr, ldhelp,
+    nulcmd, nulcmd, chkURL, chkWORD, shiftl, pginfo, shiftr, ldhelp,
     /*  @       A       B       C       D       E       F       G        */
-    readsh, nulcmd, backBf, nulcmd, nulcmd, editBf, rFrame, goLine,
+    readsh, nulcmd, backBf, nulcmd, ldDL, editBf, rFrame, goLine,
     /*  H       I       J       K       L       M       N       O        */
-    ldhelp, followI, lup1, ldown1, nulcmd, extbrz, nextMk, nulcmd,
+    ldhelp, followI, lup1, ldown1, linkLst, extbrz, nextMk, nulcmd,
     /*  P       Q       R       S       T       U       V       W        */
-    prevMk, quitfm, reload, svBuf, nulcmd, goURL, ldfile, nulcmd,
+    prevMk, quitfm, reload, svBuf, newT, goURL, ldfile, movLW,
     /*  X       Y       Z       [       \       ]       ^       _        */
-    nulcmd, nulcmd, ctrCsrH, nulcmd, vwSrc, nulcmd, linbeg, nulcmd,
+    nulcmd, nulcmd, ctrCsrH, topA, vwSrc, lastA, linbeg, nulcmd,
     /*  `       a       b       c       d       e       f       g        */
     nulcmd, adBmark, pgBack, curURL, svA, nulcmd, nulcmd, goURL,
     /*  h       i       j       k       l       m       n       o        */
-    movL, peekIMG, movD, movU, movR, nulcmd, srchnxt, ldOpt,
+    movL, peekIMG, movD, movU, movR, msToggle, srchnxt, ldOpt,
     /*  p       q       r       s       t       u       v       w        */
-    svBuf, qquitfm, nulcmd, selMn, nulcmd, peekURL, ldBmark, wrapToggle,
+    svBuf, qquitfm, dispVer, selMn, nulcmd, peekURL, ldBmark, movRW,
     /*  x       y       z       {       |       }       ~       DEL      */
-    nulcmd, nulcmd, ctrCsrV, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
+    nulcmd, nulcmd, ctrCsrV, prevT, pipeBuf, nextT, nulcmd, nulcmd,
 };
 
 unsigned char EscKeymap[128] = {
@@ -64,21 +64,21 @@ unsigned char EscKeymap[128] = {
     /*  0       1       2       3       4       5       6       7        */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  8       9       :       ;       <       =       >       ?        */
-    nulcmd, nulcmd, chkNMID, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
+    nulcmd, nulcmd, chkNMID, nulcmd, goLineF, nulcmd, goLineL, nulcmd,
     /*  @       A       B       C       D       E       F       G        */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  H       I       J       K       L       M       N       O        */
     nulcmd, svI, nulcmd, nulcmd, nulcmd, linkbrz, nulcmd, escbmap,
     /*  P       Q       R       S       T       U       V       W        */
-    nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
+    nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, dictwordat,
     /*  X       Y       Z       [       \       ]       ^       _        */
     nulcmd, nulcmd, nulcmd, escbmap, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  `       a       b       c       d       e       f       g        */
-    nulcmd, adBmark, ldBmark, nulcmd, nulcmd, editScr, nulcmd, nulcmd,
+    nulcmd, adBmark, ldBmark, execCmd, nulcmd, editScr, nulcmd, goLine,
     /*  h       i       j       k       l       m       n       o        */
-    nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
+    nulcmd, nulcmd, nulcmd, defKey, listMn, movlistMn, nextMk, setOpt,
     /*  p       q       r       s       t       u       v       w        */
-    nulcmd, nulcmd, nulcmd, svSrc, nulcmd, gorURL, pgBack, nulcmd,
+    prevMk, nulcmd, nulcmd, svSrc, tabMn, gorURL, pgBack, dictword,
     /*  x       y       z       {       |       }       ~       DEL      */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
 };
@@ -101,9 +101,9 @@ unsigned char EscBKeymap[128] = {
     /*  8       9       :       ;       <       =       >       ?        */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  @       A       B       C       D       E       F       G        */
-    nulcmd, prevA, nextA, followA, backBf, nulcmd, nulcmd, nulcmd,
+    nulcmd, prevA, nextA, followA, backBf, nulcmd, goLineL, pgFore,
     /*  H       I       J       K       L       M       N       O        */
-    nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, mouse, nulcmd, nulcmd,
+    goLineF, pgBack, nulcmd, nulcmd, nulcmd, mouse, nulcmd, nulcmd,
     /*  P       Q       R       S       T       U       V       W        */
     nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
     /*  X       Y       Z       [       \       ]       ^       _        */