Updates from 0.2.1 into 0.2.1-inu-1.5release-0-2-1-inu-1-5

8 files changed, 142 insertions, 36 deletions

diff --git a/doc/FAQ.html b/doc/FAQ.html
index 7cfa173..0a62266 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -256,7 +256,7 @@ with Ctrl-u. What to do?</h3>
 <i>Up to <a href="#index">index</a></i>
 </div>
 <br>
-<u><h2><a name="other">Miscellanous</a></h2></u>
+<u><h2><a name="other">Miscellaneous</a></h2></u>
 <br>
 <dl>
 <dt><h3>What is w3m's configuration file?</h3>
diff --git a/doc/MANUAL.html b/doc/MANUAL.html
index 724340e..4e6f397 100644
--- a/doc/MANUAL.html
+++ b/doc/MANUAL.html
@@ -52,8 +52,6 @@ Options are as follows:
 <dd>When displaying text/plain document, prohibit emphasis using backspace.
 If you don't specify this option, 
 ``A^H_'' is interpreted as underlined character and ``A^HA'' as a bold character.
-<dt>-S
-<dd>When displaying text/plain document, squeeze blank lines.
 <dt>-l number
 <dd>Specify line number preserved internally when reading text/plain document
 fron standard input. Default is 10000.
@@ -80,8 +78,10 @@ Display HTML source
 </pre>
 <dt>-m
 <dd>Display document with Internet message mode.
-With this option, w3m determines document type from header infomation.
+With this option, w3m determines document type from header information.
 It is useful when reading E-mail or NetNews messages.
+<dt>-v
+<dd>visual startup mode.
 <dt>-B
 <dd>Show the bookmark.
 <dt>-bookmark file
@@ -91,7 +91,7 @@ It is useful when reading E-mail or NetNews messages.
 <dt>-F
 <dd>Automatically render frame.
 <dt>-S
-<dd>Sqeeze blank lines.
+<dd>Squeeze blank lines.
 <dt>-X
 <dd>Upon exit, do not display preserved screen.
 <dt>-W
@@ -120,12 +120,22 @@ with -cols option.
 <dd>Read document specified by URL and dump the source.
 <dt>-dump_head
 <dd>Read document specified by URL and dump headers.
+<dt>-dump_both
+<dd>Read document specified by URL and dump headers and the source.
+<dt>-dump_extra
+<dd>Read document specified by URL and dump extra informations, headers and the source.
+<dt>-post file
+<dd>use POST method with file content.
+<dt>-header string
+<dd>insert string as a header.
 <dt>-no-proxy
 <dd>Don't use proxy server.
 <dt>-no-graph
 <dd>Don't use graphic character to draw frames.
 <dt>-no-mouse
 <dd>Don't activate mouse.
+<dt>-config file
+<dd>specify config file.
 </dl>
 
 <hr>
@@ -163,17 +173,21 @@ bindings, see <a href="#Key:lynx">the Lynx-like key binding</a>.
 <TR><TD>k,C-p<TD>Cursor up
 <TR><TD>J<TD>Roll up one line
 <TR><TD>K<TD>Roll down one line
+<TR><TD>^,C-a<TD>Go to the beginning of line
+<TR><TD>$,C-e<TD>Go to the end of line
 <TR><TD>w<TD>Go to next word
 <TR><TD>W<TD>Go to previous word
 <TR><TD>&gt;<TD>Shift screen right
 <TR><TD>&lt;<TD>Shift screen left
 <TR><TD>.<TD>Shift screen one column right
 <TR><TD>,<TD>Shift screen one column left
-<TR><TD>g<TD>Go to the first line
-<TR><TD>G<TD>Go to the last line
+<TR><TD>g,M-&lt;<TD>Go to the first line
+<TR><TD>G,M-&gt;<TD>Go to the last line
 <TR><TD>ESC g<TD>Go to specified line
+<TR><TD>Z<TD>Move to the center line
+<TR><TD>z<TD>Move to the center column
 <TR><TD>TAB<TD>Move to next hyperlink
-<TR><TD>ESC TAB<TD>Move to previous hyperlink
+<TR><TD>C-u,ESC TAB<TD>Move to previous hyperlink
 <TR><TD>[<TD>Move to the first hyperlink
 <TR><TD>]<TD>Move to the last hyperlink
 </table>
@@ -183,12 +197,15 @@ bindings, see <a href="#Key:lynx">the Lynx-like key binding</a>.
 <TR><TD WIDTH=100>RET<TD>Follow hyperlink
 <TR><TD>a, ESC RET<TD>Save link to file
 <TR><TD>u<TD>Peek link URL
+<TR><TD>i<TD>Peek image URL
 <TR><TD>I<TD>View inline image
 <TR><TD>ESC I<TD>Save inline image to file
 <TR><TD>:<TD>Mark URL-like strings as anchors
 <TR><TD>ESC :<TD>Mark Message-ID-like strings as news anchors
 <TR><TD>c<TD>Peek current URL
-<TR><TD>=<TD>Display infomation about current document
+<TR><TD>=<TD>Display information about current document
+<TR><TD>C-g<TD>Show current line number
+<TR><TD>C-h<TD>View history of URL
 <TR><TD>F<TD>Render frame
 <TR><TD>M<TD>Browse current document using external browser
 (use 2M and 3M to invoke second and third browser)
@@ -210,6 +227,7 @@ bindings, see <a href="#Key:lynx">the Lynx-like key binding</a>.
 <TR><TD>v<TD>View HTML source
 <TR><TD>s<TD>Select buffer
 <TR><TD>E<TD>Edit buffer source
+<TR><TD>C-l<TD>Redraw screen
 <TR><TD>R<TD>Reload buffer
 <TR><TD>S<TD>Save buffer
 <TR><TD>ESC s<TD>Save source
@@ -236,6 +254,7 @@ bindings, see <a href="#Key:lynx">the Lynx-like key binding</a>.
 <TR><TD>?,C-r<TD>Search backward
 <TR><TD>n<TD>Search next
 <TR><TD>N<TD>Search previous
+<TR><TD>C-w<TD>Toggle wrap search mode
 </table>
 
 <H3>Mark operation</H3>
@@ -251,6 +270,7 @@ bindings, see <a href="#Key:lynx">the Lynx-like key binding</a>.
 <TR><TD WIDTH=100>!<TD>Execute shell command
 <TR><TD>H<TD>Help (load this file)
 <TR><TD>o<TD>Set option
+<TR><TD>C-k<TD>Show cookie jar
 <TR><TD>C-c<TD>Stop
 <TR><TD>C-z<TD>Suspend
 <TR><TD>q<TD>Quit (with confirmation, if you like)
@@ -282,21 +302,26 @@ you can use the following key binding.
 
 <H3>Page/Cursor motion</H3>
 <table>
-<TR><TD WIDTH=100>SPC,C-v<TD>Forward page
-<TR><TD>b,ESC v<TD>Previous page
+<TR><TD WIDTH=100>SPC,C-v,+<TD>Forward page
+<TR><TD>b,ESC v,-<TD>Previous page
 <TR><TD>l<TD>Cursor right
 <TR><TD>h<TD>Cursor left
 <TR><TD>j<TD>Cursor down
 <TR><TD>k<TD>Cursor up
 <TR><TD>J<TD>Roll up one line
 <TR><TD>K<TD>Roll down one line
+<TR><TD>^<TD>Go to the beginning of line
+<TR><TD>$<TD>Go to the end of line
 <TR><TD>&gt;<TD>Shift screen right
 <TR><TD>&lt;<TD>Shift screen left
-<TR><TD>.<TD>Shift screen one column right
-<TR><TD>,<TD>Shift screen one column left
+<TR><TD>C-a<TD>Go to the first line
+<TR><TD>C-e<TD>Go to the last line
 <TR><TD>G<TD>Go to the specified line
+<TR><TD>Z<TD>Move to the center line
+<TR><TD>z<TD>Move to the center column
 <TR><TD>TAB,C-n,Down arrow<TD>Move to next hyperlink
 <TR><TD>ESC TAB,C-p,Up arrow<TD>Move to previous link
+<TR><TD>C-g<TD>Show current page position
 </table>
 
 
@@ -305,12 +330,14 @@ you can use the following key binding.
 <TR><TD WIDTH=100>RET, C-f, Right arrow<TD>Follow hyperlink
 <TR><TD>d, ESC RET<TD>Save link to file
 <TR><TD>u<TD>Peek link URL
+<TR><TD>i<TD>Peek image URL
 <TR><TD>I<TD>View inline image
 <TR><TD>ESC I<TD>Save inline image to file
 <TR><TD>:<TD>Mark URL-like strings as anchors
 <TR><TD>ESC :<TD>Mark Message-ID-like strings as news anchors
 <TR><TD>c<TD>Peek current URL
-<TR><TD>=<TD>Display infomation about current document
+<TR><TD>=<TD>Display information about current document
+<TR><TD>C-h<TD>View history of URL
 <TR><TD>F<TD>Render frame
 <TR><TD>M<TD>Browse current document using external browser
 (use 2M and 3M to invoke second and third browser)
@@ -332,6 +359,7 @@ you can use the following key binding.
 <TR><TD>\<TD>View HTML source
 <TR><TD>s, C-h<TD>Select buffer
 <TR><TD>E<TD>Edit buffer source
+<TR><TD>C-l, C-w<TD>Redraw screen
 <TR><TD>R, C-r<TD>Reload buffer
 <TR><TD>S, p<TD>Save buffer
 <TR><TD>ESC s<TD>Save source
@@ -354,24 +382,25 @@ you can use the following key binding.
 
 <H2>Search</H2>
 <table>
-<TR><TD WIDTH=100>/<TD>Search forward
-<TR><TD>?<TD>Search backward
+<TR><TD WIDTH=100>/, C-s<TD>Search forward
 <TR><TD>n<TD>Search next
+<TR><TD>w<TD>Toggle wrap search mode
 </table>
 
 <H2>Mark operation</H2>
 <table>
 <TR><TD WIDTH=100>C-SPC<TD>Set/unset mark
-<TR><TD>ESC p<TD>Go to previous mark
-<TR><TD>ESC n<TD>Go to next mark
+<TR><TD>P<TD>Go to previous mark
+<TR><TD>N<TD>Go to next mark
 <TR><TD>"<TD>Mark by regular expression
 </table>
 
 <H2>Miscellany</H2>
 <table>
 <TR><TD WIDTH=100>!<TD>Execute shell command
-<TR><TD>H<TD>Help (load this file)
+<TR><TD>H, ?<TD>Help (load this file)
 <TR><TD>o<TD>Set option
+<TR><TD>C-k<TD>Show cookie jar
 <TR><TD>C-c<TD>Stop
 <TR><TD>C-z<TD>Suspend
 <TR><TD>q<TD>Quit (with confirmation, if you like)
diff --git a/doc/README b/doc/README
index 72246d1..465f874 100644
--- a/doc/README
+++ b/doc/README
@@ -18,7 +18,7 @@ used as a text-mode WWW browser.
 
 Current problems are:
 
-* Resize behaviour is imcomplete.
+* Resize behaviour is incomplete.
 * It can't show images inline. (It seems to be impossible as far as using
   xterm)
 * It doesn't decode MIME-body of the document.
diff --git a/doc/README.func b/doc/README.func
index 7b2bc6b..a5a50fd 100644
--- a/doc/README.func
+++ b/doc/README.func
@@ -6,10 +6,11 @@ BOOKMARK	Read bookmark
 CENTER_H	Move to the center line
 CENTER_V	Move to the center column
 COOKIE		View cookie list
-DELETE_PREVBUF  Delete previous buffer
+DELETE_PREVBUF  Delete previous buffer (mainly for local-CGI)
 DICT_WORD	Execute dictionary command (see README.dict)
+DICT_WORD_AT   Execute dictionary command for word at cursor
 DOWN		Scroll down one line
-DOWN_LOAD	Save HTML source
+DOWNLOAD       Save HTML source
 EDIT		Edit current document
 EDIT_SCREEN	Edit currently rendered document
 END		Go to the last line
@@ -25,31 +26,46 @@ HELP		View help
 HISTORY		View history of URL
 INFO		View info of current document
 INTERRUPT	Stop loading document
-INIT_MAILCAP    Reread mailcap
+INIT_MAILCAP    Reread mailcap (mainly for local-CGI)
 LEFT		Shift screen one column
 LINE_BEGIN	Go to the beginning of line
 LINE_END	Go to the end of line
 LINE_INFO	Show current line number
+LINK_BEGIN     Go to the first link
+LINK_END       Go to the last link
 LOAD		Load local file
 MAIN_MENU	Popup menu
 MARK		Set/unset mark
 MARK_MID	Mark Message-ID-like strings as anchors
 MARK_URL	Mark URL-like strings as anchors
 MENU		Popup menu
-MOVE_DOWN	Move cursor down
-MOVE_LEFT	Move cursor left
-MOVE_RIGHT	Move cursor right
-MOVE_UP		Move cursor up
+MOUSE_TOGGLE   Toggle activity of mouse
+MOVE_DOWN      Move cursor down (a half screen scroll at the end of screen)
+MOVE_DOWN1     Move cursor down (1 line scroll at the end of screen)
+MOVE_LEFT      Move cursor left (a half screen shift at the left edge)
+MOVE_LEFT1     Move cursor left (1 columns shift at the left edge)
+MOVE_RIGHT     Move cursor right (a half screen shift at the right edge)
+MOVE_RIGHT1    Move cursor right (1 columns shift at the right edge)
+MOVE_UP                Move cursor up (a half screen scroll at the top of screen)
+MOVE_UP1       Move cursor up (1 line scrol at the top of screen)
+MSGS        Display error messages
+NEXT_DOWN      Move to next downward link 
+NEXT_LEFT      Move to next left link 
+NEXT_LEFT_UP   Move to next left (or upward) link 
 NEXT_LINK	Move to next link
 NEXT_MARK	Move to next word
 NEXT_PAGE	Move to next page
+NEXT_RIGHT     Move to next right link 
+NEXT_RIGHT_DOWN        Move to next right (or downward) link 
+NEXT_UP                Move to next upward link 
 NEXT_WORD	Move to next word
 NOTHING		Do nothing
 NULL		Do nothing
 OPTIONS		Option setting panel
 PEEK		Peek current URL
-PEEK_LINK	Peek link URL
 PEEK_IMG	Peek image URL 
+PEEK_LINK      Peek link URL
+PIPE_BUF       Send rendered document to pipe
 PIPE_SHELL	Execute shell command and browse
 PREV_LINK	Move to previous link
 PREV_MARK	Move to previous mark
@@ -72,14 +88,18 @@ SEARCH_FORE	Search forward
 SEARCH_NEXT	Search next regexp
 SEARCH_PREV	Search previous regexp
 SELECT		Go to buffer selection panel
+SELECT_MENU    Popup buffer selection menu
+SETENV        Set environment variable
+SET_OPTION     Set option
 SHELL		Execute shell command
 SHIFT_LEFT	Shift screen left
 SHIFT_RIGHT	Shift screen right
 SOURCE		View HTML source
 SUSPEND		Stop loading document
 UP		Scroll up one line
+VERSION                Display version of w3m
 VIEW		View HTML source
 VIEW_BOOKMARK	View bookmark
 VIEW_IMAGE	View image
 WHEREIS		Search forward
-WRAP_TOGGLE   Toggle wrap search mode
+WRAP_TOGGLE    Toggle wrap search mode
diff --git a/doc/STORY.html b/doc/STORY.html
index 14a3c08..49ec749 100644
--- a/doc/STORY.html
+++ b/doc/STORY.html
@@ -101,7 +101,7 @@ read the research log. Then I decided to implement a table renderer
 into w3m.
 <P>
 I didn't intend to write a perfect table renderer because tables
-I used was not very complicated. However, imcomplete table rendering
+I used was not very complicated. However, incomplete table rendering
 made the display of table-layout pages horrible. I realized that
 it required almost-perfect table renderer 
 to do well both in `rendering (real) table' and `fine display of
diff --git a/doc/keymap.default b/doc/keymap.default
index 38279ce..e692340 100644
--- a/doc/keymap.default
+++ b/doc/keymap.default
@@ -26,7 +26,9 @@ keymap	C-n	MOVE_DOWN
 keymap	C-p	MOVE_UP
 keymap	C-r	SEARCH_BACK
 keymap	C-s	SEARCH
+keymap	C-u	PREV_LINK
 keymap	C-v	NEXT_PAGE
+keymap	C-w	WRAP_TOGGLE
 keymap	C-z	SUSPEND
 
 keymap	SPC	NEXT_PAGE
@@ -52,6 +54,7 @@ keymap	I	VIEW_IMAGE
 keymap	J	UP
 keymap	K	DOWN
 keymap	M	EXTERN
+keymap	N	SEARCH_PREV
 keymap	Q	EXIT
 keymap	R	RELOAD
 keymap	S	SAVE_SCREEN
@@ -59,6 +62,8 @@ keymap	U	GOTO
 keymap	V	LOAD
 keymap	W	PREV_WORD
 keymap	Z	CENTER_H
+keymap	[	LINK_BEGIN
+keymap	]	LINK_END
 keymap	\^	LINE_BEGIN
 keymap	a	SAVE_LINK
 keymap	b	PREV_PAGE
@@ -72,7 +77,7 @@ keymap	l	MOVE_RIGHT
 keymap	n	SEARCH_NEXT
 keymap	o	OPTIONS
 keymap	q	QUIT
-keymap	s	SELECT
+keymap s       SELECT_MENU
 keymap	u	PEEK_LINK
 keymap	v	VIEW
 keymap	w	NEXT_WORD
diff --git a/doc/keymap.lynx b/doc/keymap.lynx
index 6c14a30..095a1ab 100644
--- a/doc/keymap.lynx
+++ b/doc/keymap.lynx
@@ -12,9 +12,10 @@
 
 keymap	C-@	MARK
 keymap	C-a	BEGIN
-keymap	C-b	PREV_PAGE
+keymap	C-b	BACK
 keymap	C-e	END
-keymap	C-f	NEXT_PAGE
+keymap	C-f	GOTO_LINK
+keymap	C-g	LINE_INFO
 keymap	C-h	HISTORY
 keymap	TAB	NEXT_LINK
 keymap	C-j	GOTO_LINK
@@ -51,6 +52,7 @@ keymap	H	HELP
 keymap	I	VIEW_IMAGE
 keymap	J	UP
 keymap	K	DOWN
+keymap	M	EXTERN
 keymap	N	NEXT_MARK
 keymap	P	PREV_MARK
 keymap	Q	EXIT
@@ -64,7 +66,7 @@ keymap	\^	LINE_BEGIN
 keymap	a	ADD_BOOKMARK
 keymap	b	PREV_PAGE
 keymap	c	PEEK
-keymap	d	SAVE
+keymap	d	SAVE_LINK
 keymap	g	GOTO
 keymap	h	MOVE_LEFT
 keymap	i	PEEK_IMG
@@ -75,9 +77,10 @@ keymap	n	SEARCH_NEXT
 keymap	o	OPTIONS
 keymap	p	SAVE_SCREEN
 keymap	q	QUIT
-keymap	s	SELECT
+keymap s       SELECT_MENU
 keymap	u	PEEK_LINK
 keymap	v	BOOKMARK
+keymap	w	WRAP_TOGGLE
 keymap	z	CENTER_V
 
 keymap	M-TAB	PREV_LINK
@@ -86,6 +89,7 @@ keymap	M-C-m	SAVE_LINK
 
 keymap	M-:	MARK_MID
 keymap	M-I	SAVE_IMAGE
+keymap	M-M	EXTERN_LINK
 keymap	M-a	ADD_BOOKMARK
 keymap	M-b	BOOKMARK
 keymap	M-e	EDIT_SCREEN
diff --git a/doc/w3m.1 b/doc/w3m.1
index 91ae2a4..b4cc206 100644
--- a/doc/w3m.1
+++ b/doc/w3m.1
@@ -65,12 +65,18 @@ EUC-JP
 .B -B
 load bookmark
 .TP
+.B -bookmark file
+specify bookmark file
+.TP
 .B -T type
 specify content-type
 .TP
 .B -m
 internet message mode
 .TP
+.B -v
+visual startup mode
+.TP
 .B -M
 monochrome display
 .TP
@@ -90,9 +96,51 @@ Larger values will make tables narrower.
 .B -dump_source
 dump page source into stdout
 .TP
+.B -dump_head
+dump response of HEAD request into stdout
+.TP
+.B -dump_both
+dump HEAD and source into stdout
+.TP
+.B -dump_extra
+dump HEAD, source, and extra information into stdout
+.TP
+.B -post file
+use POST method with file content
+.TP
+.B -header string
+insert string as a header
+.TP
 .B +<num>
 goto <num> line
 .TP
+.B -num
+show line number
+.TP
+.B -no-proxy
+don't use proxy
+.TP
+.B -no-mouse
+don't use mouse
+.TP
+.B -pauth user:pass
+proxy authentication
+.TP
+.B -S
+squeeze multiple blank lines
+.TP
+.B -W
+toggle wrap search mode
+.TP
+.B -X
+don't use termcap init/deinit
+.TP
+.B -o opt=value
+assign value to config option
+.TP
+.B -config file
+specify config file
+.TP
 .B -debug
 DO NOT USE
 .SH EXAMPLES
@@ -113,7 +161,7 @@ $ cat foo.html | w3m -dump -T text/html >foo.txt
 This is the
 .I
 w3m
-990604 Release.
+0.2.1 Release.
 .PP
 Additional information about
 .I